Skip to content

Commit fc6a25f

Browse files
committed
Update namespaces in Test project
1 parent 65f18f4 commit fc6a25f

18 files changed

+40
-46
lines changed

Libraries/TranscriptTestRunner.Tests/TranscriptTestRunner.Tests.csproj renamed to Libraries/TranscriptTestRunner.Tests/Microsoft.Bot.Builder.Testing.TestRunner.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\Libraries\TranscriptTestRunner\TranscriptTestRunner.csproj" />
18+
<ProjectReference Include="..\TranscriptTestRunner\Microsoft.Bot.Builder.Testing.TestRunner.csproj" />
1919
</ItemGroup>
2020

2121
</Project>

FunctionalTests.sln renamed to Tests.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29806.167
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "Tests\Functional\FunctionalTests.csproj", "{DE0231D9-A9BE-4D4C-A830-7ADCF28EA5D6}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Tests.Functional", "Tests\Functional\Microsoft.Bot.Builder.Tests.Functional.csproj", "{DE0231D9-A9BE-4D4C-A830-7ADCF28EA5D6}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranscriptTestRunner", "Libraries\TranscriptTestRunner\TranscriptTestRunner.csproj", "{65C3A2E0-FDC5-4132-9980-3BAE230E9F2E}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Testing.TestRunner", "Libraries\TranscriptTestRunner\Microsoft.Bot.Builder.Testing.TestRunner.csproj", "{65C3A2E0-FDC5-4132-9980-3BAE230E9F2E}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BCBFF5A2-F2CD-4F82-BCD1-ED8E7950D82F}"
1111
ProjectSection(SolutionItems) = preProject
@@ -14,13 +14,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
Directory.Build.props = Directory.Build.props
1515
EndProjectSection
1616
EndProject
17-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranscriptConverter", "Libraries\TranscriptConverter\TranscriptConverter.csproj", "{EF963904-79CB-4222-811A-E24B73E5DC1A}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranscriptConverter", "Libraries\TranscriptConverter\Microsoft.Bot.Builder.Testing.TranscriptConverter.csproj", "{EF963904-79CB-4222-811A-E24B73E5DC1A}"
1818
EndProject
1919
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{B5E35C94-0880-4AEB-8F3C-940FECA7A8C7}"
2020
EndProject
2121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5A0C68F1-6CA7-43D7-8F01-70A484D8D412}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranscriptTestRunner.Tests", "Libraries\TranscriptTestRunner.Tests\TranscriptTestRunner.Tests.csproj", "{5CAE9F80-9BD3-480C-8504-552B31B265E0}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranscriptTestRunner.Tests", "Libraries\TranscriptTestRunner.Tests\Microsoft.Bot.Builder.Testing.TestRunner.Tests.csproj", "{5CAE9F80-9BD3-480C-8504-552B31B265E0}"
2424
EndProject
2525
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Functional", "Functional", "{DDEE53CF-F094-4009-B198-AA656CB7A009}"
2626
EndProject

Tests/Functional/FunctionalTests.csproj renamed to Tests/Functional/Microsoft.Bot.Builder.Tests.Functional.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\..\Libraries\TranscriptTestRunner\TranscriptTestRunner.csproj" />
27+
<ProjectReference Include="..\..\Libraries\TranscriptTestRunner\Microsoft.Bot.Builder.Testing.TestRunner.csproj" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

Tests/Functional/ScriptTestBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
using System.Collections.Generic;
55
using System.IO;
6+
using Microsoft.Bot.Builder.Testing.TestRunner.TestClients;
7+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
68
using Microsoft.Extensions.Configuration;
79
using Microsoft.Extensions.Logging;
8-
using SkillFunctionalTests.Skills.Common;
9-
using TranscriptTestRunner.TestClients;
1010
using Xunit.Abstractions;
1111

12-
namespace SkillFunctionalTests
12+
namespace Microsoft.Bot.Builder.Tests.Functional
1313
{
1414
public class ScriptTestBase
1515
{

Tests/Functional/Skills/CardActions/CardActionsTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Threading.Tasks;
7+
using Microsoft.Bot.Builder.Testing.TestRunner;
8+
using Microsoft.Bot.Builder.Testing.TestRunner.XUnit;
9+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
710
using Microsoft.Bot.Connector;
811
using Microsoft.Bot.Schema;
912
using Microsoft.Extensions.Logging;
1013
using Newtonsoft.Json;
11-
using SkillFunctionalTests.Skills.Common;
12-
using TranscriptTestRunner;
13-
using TranscriptTestRunner.XUnit;
1414
using Xunit;
1515
using Xunit.Abstractions;
1616

17-
namespace SkillFunctionalTests.Skills.CardActions
17+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.CardActions
1818
{
1919
[Trait("TestCategory", "CardActions")]
2020
public class CardActionsTests : ScriptTestBase

Tests/Functional/Skills/Common/HostBot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
namespace SkillFunctionalTests.Skills.Common
4+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
55
{
66
public enum HostBot
77
{

Tests/Functional/Skills/Common/SkillBotNames.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
namespace SkillFunctionalTests.Skills.Common
4+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
55
{
66
public static class SkillBotNames
77
{

Tests/Functional/Skills/Common/TestCase.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
using Microsoft.Bot.Connector;
5-
using TranscriptTestRunner;
6-
7-
namespace SkillFunctionalTests.Skills.Common
4+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
85
{
96
public class TestCase
107
{

Tests/Functional/Skills/Common/TestCaseBuilder.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
using System;
55
using System.Collections.Generic;
6-
using TranscriptTestRunner;
76

8-
namespace SkillFunctionalTests.Skills.Common
7+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
98
{
109
public class TestCaseBuilder
1110
{

Tests/Functional/Skills/Common/TestCaseDataObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Newtonsoft.Json;
66
using Xunit.Abstractions;
77

8-
namespace SkillFunctionalTests.Skills.Common
8+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Common
99
{
1010
public class TestCaseDataObject : IXunitSerializable
1111
{

Tests/Functional/Skills/FileUpload/FileUploadTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
using System.Collections.Generic;
66
using System.IO;
77
using System.Threading.Tasks;
8+
using Microsoft.Bot.Builder.Testing.TestRunner;
9+
using Microsoft.Bot.Builder.Testing.TestRunner.XUnit;
10+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
811
using Microsoft.Bot.Connector;
912
using Microsoft.Bot.Schema;
1013
using Microsoft.Extensions.Logging;
1114
using Newtonsoft.Json;
12-
using SkillFunctionalTests.Skills.Common;
13-
using TranscriptTestRunner;
14-
using TranscriptTestRunner.XUnit;
1515
using Xunit;
1616
using Xunit.Abstractions;
1717

18-
namespace SkillFunctionalTests.Skills.FileUpload
18+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.FileUpload
1919
{
2020
[Trait("TestCategory", "FileUpload")]
2121
public class FileUploadTests : ScriptTestBase

Tests/Functional/Skills/MessageWithAttachment/MessageWithAttachmentTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Threading.Tasks;
7+
using Microsoft.Bot.Builder.Testing.TestRunner;
8+
using Microsoft.Bot.Builder.Testing.TestRunner.XUnit;
9+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
710
using Microsoft.Bot.Connector;
811
using Microsoft.Bot.Schema;
912
using Microsoft.Extensions.Logging;
1013
using Newtonsoft.Json;
11-
using SkillFunctionalTests.Skills.Common;
12-
using TranscriptTestRunner;
13-
using TranscriptTestRunner.XUnit;
1414
using Xunit;
1515
using Xunit.Abstractions;
1616

17-
namespace SkillFunctionalTests.Skills.MessageWithAttachment
17+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.MessageWithAttachment
1818
{
1919
[Trait("TestCategory", "Attachments")]
2020
public class MessageWithAttachmentTests : ScriptTestBase

Tests/Functional/Skills/ProactiveMessages/ProactiveTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
using System.IO;
66
using System.Net.Http;
77
using System.Threading.Tasks;
8+
using Microsoft.Bot.Builder.Testing.TestRunner;
9+
using Microsoft.Bot.Builder.Testing.TestRunner.XUnit;
10+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
811
using Microsoft.Bot.Connector;
912
using Microsoft.Bot.Schema;
1013
using Microsoft.Extensions.Logging;
1114
using Newtonsoft.Json;
12-
using SkillFunctionalTests.Skills.Common;
13-
using TranscriptTestRunner;
14-
using TranscriptTestRunner.XUnit;
1515
using Xunit;
1616
using Xunit.Abstractions;
1717

18-
namespace SkillFunctionalTests.Skills.ProactiveMessages
18+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.ProactiveMessages
1919
{
2020
[Trait("TestCategory", "ProactiveMessages")]
2121
public class ProactiveTests : ScriptTestBase

Tests/Functional/Skills/SignIn/SignInTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
using System.IO;
66
using System.Linq;
77
using System.Threading.Tasks;
8+
using Microsoft.Bot.Builder.Testing.TestRunner;
9+
using Microsoft.Bot.Builder.Testing.TestRunner.XUnit;
10+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
811
using Microsoft.Bot.Connector;
912
using Microsoft.Bot.Schema;
1013
using Microsoft.Extensions.Logging;
1114
using Newtonsoft.Json;
12-
using SkillFunctionalTests.Skills.Common;
13-
using TranscriptTestRunner;
14-
using TranscriptTestRunner.XUnit;
1515
using Xunit;
1616
using Xunit.Abstractions;
1717

18-
namespace SkillFunctionalTests.Skills.SignIn
18+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.SignIn
1919
{
2020
[Trait("TestCategory", "SignIn")]
2121
public class SignInTests : ScriptTestBase

Tests/Functional/Skills/SingleTurn/EchoTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Threading.Tasks;
7+
using Microsoft.Bot.Builder.Testing.TestRunner;
8+
using Microsoft.Bot.Builder.Testing.TestRunner.XUnit;
9+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
710
using Microsoft.Bot.Connector;
811
using Microsoft.Bot.Schema;
912
using Microsoft.Extensions.Logging;
1013
using Newtonsoft.Json;
11-
using SkillFunctionalTests.Skills.Common;
12-
using TranscriptTestRunner;
13-
using TranscriptTestRunner.XUnit;
1414
using Xunit;
1515
using Xunit.Abstractions;
1616

17-
namespace SkillFunctionalTests.Skills.SingleTurn
17+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.SingleTurn
1818
{
1919
[Trait("TestCategory", "SingleTurn")]
2020
public class EchoTests : ScriptTestBase

Tests/Functional/Skills/Sso/SsoTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Threading.Tasks;
7+
using Microsoft.Bot.Builder.Tests.Functional.Skills.Common;
78
using Microsoft.Bot.Connector;
89
using Microsoft.Bot.Schema;
910
using Microsoft.Extensions.Logging;
1011
using Newtonsoft.Json;
11-
using SkillFunctionalTests.Skills.Common;
12-
using TranscriptTestRunner;
13-
using TranscriptTestRunner.XUnit;
1412
using Xunit;
1513
using Xunit.Abstractions;
1614

17-
namespace SkillFunctionalTests.Skills.Sso
15+
namespace Microsoft.Bot.Builder.Tests.Functional.Skills.Sso
1816
{
1917
public class SsoTests : ScriptTestBase
2018
{

0 commit comments

Comments
 (0)