From f7e6bc64b05bb31658c792c78becccd0d104ac79 Mon Sep 17 00:00:00 2001 From: Dmytro Struk Date: Mon, 13 Mar 2023 08:49:29 +0000 Subject: [PATCH 1/4] Updated integration test project name --- dotnet/SK-dotnet.sln | 2 +- .../AI/OpenAICompletionTests.cs | 4 ++-- .../AI/OpenAIEmbeddingTests.cs | 4 ++-- .../README.md | 0 .../RedirectOutput.cs | 2 +- .../SemanticKernel.IntegrationTests.csproj} | 4 ++-- .../TestSettings/AzureOpenAIConfiguration.cs | 2 +- .../TestSettings/OpenAIConfiguration.cs | 2 +- .../WebSkill/WebSkillTests.cs | 2 +- .../XunitLogger.cs | 2 +- .../testsettings.json | 0 11 files changed, 12 insertions(+), 12 deletions(-) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/AI/OpenAICompletionTests.cs (98%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/AI/OpenAIEmbeddingTests.cs (97%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/README.md (100%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/RedirectOutput.cs (91%) rename dotnet/src/{IntegrationTest/IntegrationTests.csproj => SemanticKernel.IntegrationTests/SemanticKernel.IntegrationTests.csproj} (92%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/TestSettings/AzureOpenAIConfiguration.cs (93%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/TestSettings/OpenAIConfiguration.cs (91%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/WebSkill/WebSkillTests.cs (98%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/XunitLogger.cs (96%) rename dotnet/src/{IntegrationTest => SemanticKernel.IntegrationTests}/testsettings.json (100%) diff --git a/dotnet/SK-dotnet.sln b/dotnet/SK-dotnet.sln index 0dfe332dbdac..d03a46e5ff4e 100644 --- a/dotnet/SK-dotnet.sln +++ b/dotnet/SK-dotnet.sln @@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsGraphSkillsExample", "..\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KernelHttpServer", "..\samples\dotnet\KernelHttpServer\KernelHttpServer.csproj", "{34A7F1EF-D243-4160-A413-D713FEABCD94}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "src\IntegrationTest\IntegrationTests.csproj", "{E4B777A1-28E1-41BE-96AE-7F3EC61FD5D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticKernel.IntegrationTests", "src\SemanticKernel.IntegrationTests\SemanticKernel.IntegrationTests.csproj", "{E4B777A1-28E1-41BE-96AE-7F3EC61FD5D4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skills.Document", "src\SemanticKernel.Skills\Skills.Document\Skills.Document.csproj", "{F94D1938-9DB7-4B24-9FF3-166DDFD96330}" EndProject diff --git a/dotnet/src/IntegrationTest/AI/OpenAICompletionTests.cs b/dotnet/src/SemanticKernel.IntegrationTests/AI/OpenAICompletionTests.cs similarity index 98% rename from dotnet/src/IntegrationTest/AI/OpenAICompletionTests.cs rename to dotnet/src/SemanticKernel.IntegrationTests/AI/OpenAICompletionTests.cs index b7cdadcf4c32..524602496a85 100644 --- a/dotnet/src/IntegrationTest/AI/OpenAICompletionTests.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/AI/OpenAICompletionTests.cs @@ -5,15 +5,15 @@ using System.IO; using System.Reflection; using System.Threading.Tasks; -using IntegrationTests.TestSettings; using Microsoft.Extensions.Configuration; using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.KernelExtensions; using Microsoft.SemanticKernel.Orchestration; +using SemanticKernel.IntegrationTests.TestSettings; using Xunit; using Xunit.Abstractions; -namespace IntegrationTests.AI; +namespace SemanticKernel.IntegrationTests.AI; public sealed class OpenAICompletionTests : IDisposable { diff --git a/dotnet/src/IntegrationTest/AI/OpenAIEmbeddingTests.cs b/dotnet/src/SemanticKernel.IntegrationTests/AI/OpenAIEmbeddingTests.cs similarity index 97% rename from dotnet/src/IntegrationTest/AI/OpenAIEmbeddingTests.cs rename to dotnet/src/SemanticKernel.IntegrationTests/AI/OpenAIEmbeddingTests.cs index 59ec26f1a5f0..fb1bf66d5264 100644 --- a/dotnet/src/IntegrationTest/AI/OpenAIEmbeddingTests.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/AI/OpenAIEmbeddingTests.cs @@ -3,14 +3,14 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using IntegrationTests.TestSettings; using Microsoft.Extensions.Configuration; using Microsoft.SemanticKernel.AI.Embeddings; using Microsoft.SemanticKernel.AI.OpenAI.Services; +using SemanticKernel.IntegrationTests.TestSettings; using Xunit; using Xunit.Abstractions; -namespace IntegrationTests.AI; +namespace SemanticKernel.IntegrationTests.AI; public sealed class OpenAIEmbeddingTests : IDisposable { diff --git a/dotnet/src/IntegrationTest/README.md b/dotnet/src/SemanticKernel.IntegrationTests/README.md similarity index 100% rename from dotnet/src/IntegrationTest/README.md rename to dotnet/src/SemanticKernel.IntegrationTests/README.md diff --git a/dotnet/src/IntegrationTest/RedirectOutput.cs b/dotnet/src/SemanticKernel.IntegrationTests/RedirectOutput.cs similarity index 91% rename from dotnet/src/IntegrationTest/RedirectOutput.cs rename to dotnet/src/SemanticKernel.IntegrationTests/RedirectOutput.cs index f3fadf13e8d2..4805d94dcf71 100644 --- a/dotnet/src/IntegrationTest/RedirectOutput.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/RedirectOutput.cs @@ -4,7 +4,7 @@ using System.Text; using Xunit.Abstractions; -namespace IntegrationTests; +namespace SemanticKernel.IntegrationTests; public class RedirectOutput : TextWriter { diff --git a/dotnet/src/IntegrationTest/IntegrationTests.csproj b/dotnet/src/SemanticKernel.IntegrationTests/SemanticKernel.IntegrationTests.csproj similarity index 92% rename from dotnet/src/IntegrationTest/IntegrationTests.csproj rename to dotnet/src/SemanticKernel.IntegrationTests/SemanticKernel.IntegrationTests.csproj index e852f071cd0c..11b9b9d17e23 100644 --- a/dotnet/src/IntegrationTest/IntegrationTests.csproj +++ b/dotnet/src/SemanticKernel.IntegrationTests/SemanticKernel.IntegrationTests.csproj @@ -1,8 +1,8 @@  - IntegrationTests - IntegrationTests + SemanticKernel.IntegrationTests + SemanticKernel.IntegrationTests net6.0 false diff --git a/dotnet/src/IntegrationTest/TestSettings/AzureOpenAIConfiguration.cs b/dotnet/src/SemanticKernel.IntegrationTests/TestSettings/AzureOpenAIConfiguration.cs similarity index 93% rename from dotnet/src/IntegrationTest/TestSettings/AzureOpenAIConfiguration.cs rename to dotnet/src/SemanticKernel.IntegrationTests/TestSettings/AzureOpenAIConfiguration.cs index 751ac908d9fc..fab4dbd4ad77 100644 --- a/dotnet/src/IntegrationTest/TestSettings/AzureOpenAIConfiguration.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/TestSettings/AzureOpenAIConfiguration.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace IntegrationTests.TestSettings; +namespace SemanticKernel.IntegrationTests.TestSettings; [SuppressMessage("Performance", "CA1812:Internal class that is apparently never instantiated", Justification = "Configuration classes are instantiated through IConfiguration.")] diff --git a/dotnet/src/IntegrationTest/TestSettings/OpenAIConfiguration.cs b/dotnet/src/SemanticKernel.IntegrationTests/TestSettings/OpenAIConfiguration.cs similarity index 91% rename from dotnet/src/IntegrationTest/TestSettings/OpenAIConfiguration.cs rename to dotnet/src/SemanticKernel.IntegrationTests/TestSettings/OpenAIConfiguration.cs index fdb0c0f3facd..c4353bab49da 100644 --- a/dotnet/src/IntegrationTest/TestSettings/OpenAIConfiguration.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/TestSettings/OpenAIConfiguration.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; -namespace IntegrationTests.TestSettings; +namespace SemanticKernel.IntegrationTests.TestSettings; [SuppressMessage("Performance", "CA1812:Internal class that is apparently never instantiated", Justification = "Configuration classes are instantiated through IConfiguration.")] diff --git a/dotnet/src/IntegrationTest/WebSkill/WebSkillTests.cs b/dotnet/src/SemanticKernel.IntegrationTests/WebSkill/WebSkillTests.cs similarity index 98% rename from dotnet/src/IntegrationTest/WebSkill/WebSkillTests.cs rename to dotnet/src/SemanticKernel.IntegrationTests/WebSkill/WebSkillTests.cs index 11ef3d1f3576..b6ca374f54cc 100644 --- a/dotnet/src/IntegrationTest/WebSkill/WebSkillTests.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/WebSkill/WebSkillTests.cs @@ -11,7 +11,7 @@ using Xunit; using Xunit.Abstractions; -namespace IntegrationTests.WebSkill; +namespace SemanticKernel.IntegrationTests.WebSkill; public sealed class WebSkillTests : IDisposable { diff --git a/dotnet/src/IntegrationTest/XunitLogger.cs b/dotnet/src/SemanticKernel.IntegrationTests/XunitLogger.cs similarity index 96% rename from dotnet/src/IntegrationTest/XunitLogger.cs rename to dotnet/src/SemanticKernel.IntegrationTests/XunitLogger.cs index 8505c1cd230b..a61dffec371f 100644 --- a/dotnet/src/IntegrationTest/XunitLogger.cs +++ b/dotnet/src/SemanticKernel.IntegrationTests/XunitLogger.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace IntegrationTests; +namespace SemanticKernel.IntegrationTests; /// /// A logger that writes to the Xunit test output diff --git a/dotnet/src/IntegrationTest/testsettings.json b/dotnet/src/SemanticKernel.IntegrationTests/testsettings.json similarity index 100% rename from dotnet/src/IntegrationTest/testsettings.json rename to dotnet/src/SemanticKernel.IntegrationTests/testsettings.json From b8f2717f3fac9c3af22590f5da47fec872eb3830 Mon Sep 17 00:00:00 2001 From: Dmytro Struk Date: Mon, 13 Mar 2023 08:50:10 +0000 Subject: [PATCH 2/4] Updated SK test project name --- .github/workflows/dotnet-ci.yml | 2 +- .github/workflows/dotnet-pr.yml | 2 +- dotnet/DocFX/docfx.json | 2 +- dotnet/SK-dotnet.sln | 2 +- .../AI/Embeddings/EmbeddingTests.cs | 2 +- .../AI/OpenAI/Services/AzureOpenAIConfigTests.cs | 2 +- .../AI/OpenAI/Services/BackendConfigTests.cs | 2 +- .../AI/OpenAI/Services/OpenAIConfigTests.cs | 2 +- .../Configuration/KernelConfigTests.cs | 2 +- .../CoreSkills/FileIOSkillTests.cs | 2 +- .../CoreSkills/HttpSkillTests.cs | 2 +- .../CoreSkills/PlannerSkillTests.cs | 2 +- .../CoreSkills/TextSkillTests.cs | 2 +- .../CoreSkills/TimeSkillTests.cs | 2 +- .../KernelTests.cs | 2 +- .../Memory/Storage/DataEntryTests.cs | 2 +- .../Memory/Storage/VolatileDataStoreTests.cs | 2 +- .../Memory/VolatileMemoryStoreTests.cs | 2 +- .../Orchestration/ContextVariablesTests.cs | 2 +- .../Orchestration/SKContextTests.cs | 2 +- .../Orchestration/SKFunctionTests1.cs | 4 ++-- .../Orchestration/SKFunctionTests2.cs | 4 ++-- .../Orchestration/SKFunctionTests3.cs | 4 ++-- .../Reliability/PassThroughWithoutRetryTests.cs | 2 +- .../Partitioning/SemanticTextPartitionerTests.cs | 4 ++-- .../SemanticKernel.UnitTests.csproj} | 4 ++-- .../SkillDefinition/FunctionsViewTests.cs | 2 +- .../TemplateEngine/Blocks/CodeBlockTests.cs | 2 +- .../TemplateEngine/PromptTemplateEngineTests.cs | 4 ++-- .../VectorOperations/VectorOperationTests.cs | 2 +- .../VectorOperations/VectorSpanTests.cs | 2 +- .../XunitHelpers/ConsoleLogger.cs | 2 +- .../XunitHelpers/RedirectOutput.cs | 2 +- dotnet/src/SemanticKernel/SemanticKernel.csproj | 2 +- 34 files changed, 40 insertions(+), 40 deletions(-) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/AI/Embeddings/EmbeddingTests.cs (96%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/AI/OpenAI/Services/AzureOpenAIConfigTests.cs (98%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/AI/OpenAI/Services/BackendConfigTests.cs (94%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/AI/OpenAI/Services/OpenAIConfigTests.cs (96%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Configuration/KernelConfigTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/CoreSkills/FileIOSkillTests.cs (98%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/CoreSkills/HttpSkillTests.cs (98%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/CoreSkills/PlannerSkillTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/CoreSkills/TextSkillTests.cs (97%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/CoreSkills/TimeSkillTests.cs (92%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/KernelTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Memory/Storage/DataEntryTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Memory/Storage/VolatileDataStoreTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Memory/VolatileMemoryStoreTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Orchestration/ContextVariablesTests.cs (98%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Orchestration/SKContextTests.cs (97%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Orchestration/SKFunctionTests1.cs (96%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Orchestration/SKFunctionTests2.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Orchestration/SKFunctionTests3.cs (98%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/Reliability/PassThroughWithoutRetryTests.cs (97%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs (99%) rename dotnet/src/{SemanticKernel.Test/SemanticKernel.Test.csproj => SemanticKernel.UnitTests/SemanticKernel.UnitTests.csproj} (89%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/SkillDefinition/FunctionsViewTests.cs (98%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/TemplateEngine/Blocks/CodeBlockTests.cs (97%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/TemplateEngine/PromptTemplateEngineTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/VectorOperations/VectorOperationTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/VectorOperations/VectorSpanTests.cs (99%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/XunitHelpers/ConsoleLogger.cs (95%) rename dotnet/src/{SemanticKernel.Test => SemanticKernel.UnitTests}/XunitHelpers/RedirectOutput.cs (90%) diff --git a/.github/workflows/dotnet-ci.yml b/.github/workflows/dotnet-ci.yml index 54861e02070c..d7da7b9814a4 100644 --- a/.github/workflows/dotnet-ci.yml +++ b/.github/workflows/dotnet-ci.yml @@ -77,7 +77,7 @@ jobs: - name: Find unit test projects shell: bash - run: echo "projects=$(find ./dotnet -type f -name "*.Test.csproj" | tr '\n' ' ')" >> $GITHUB_ENV + run: echo "projects=$(find ./dotnet -type f -name "*.UnitTests.csproj" | tr '\n' ' ')" >> $GITHUB_ENV - name: Test shell: bash diff --git a/.github/workflows/dotnet-pr.yml b/.github/workflows/dotnet-pr.yml index c85dda6a7750..58445b5455c3 100644 --- a/.github/workflows/dotnet-pr.yml +++ b/.github/workflows/dotnet-pr.yml @@ -61,7 +61,7 @@ jobs: - name: Find unit test projects shell: bash - run: echo "projects=$(find ./dotnet -type f -name "*.Test.csproj" | tr '\n' ' ')" >> $GITHUB_ENV + run: echo "projects=$(find ./dotnet -type f -name "*.UnitTests.csproj" | tr '\n' ' ')" >> $GITHUB_ENV - name: Test shell: bash diff --git a/dotnet/DocFX/docfx.json b/dotnet/DocFX/docfx.json index e3b6a418d301..e8cdd1c68b9a 100644 --- a/dotnet/DocFX/docfx.json +++ b/dotnet/DocFX/docfx.json @@ -6,7 +6,7 @@ "files": [ "**.csproj" ], - "exclude": ["**/bin/**", "**/obj/**", "**/*.Test*", "**/*.IntegrationTest*"], + "exclude": ["**/bin/**", "**/obj/**", "**/*.UnitTests*", "**/*.IntegrationTests*"], "src": ".." } ], diff --git a/dotnet/SK-dotnet.sln b/dotnet/SK-dotnet.sln index d03a46e5ff4e..3fe7345cdccf 100644 --- a/dotnet/SK-dotnet.sln +++ b/dotnet/SK-dotnet.sln @@ -35,7 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\README.md = ..\README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticKernel.Test", "src\SemanticKernel.Test\SemanticKernel.Test.csproj", "{37E39C68-5A40-4E63-9D3C-0C66AD98DFCB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticKernel.UnitTests", "src\SemanticKernel.UnitTests\SemanticKernel.UnitTests.csproj", "{37E39C68-5A40-4E63-9D3C-0C66AD98DFCB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skills.Memory.Sqlite", "src\SemanticKernel.Skills\Skills.Memory.Sqlite\Skills.Memory.Sqlite.csproj", "{E23E7270-F13D-4620-A115-AA6A8619EE5A}" EndProject diff --git a/dotnet/src/SemanticKernel.Test/AI/Embeddings/EmbeddingTests.cs b/dotnet/src/SemanticKernel.UnitTests/AI/Embeddings/EmbeddingTests.cs similarity index 96% rename from dotnet/src/SemanticKernel.Test/AI/Embeddings/EmbeddingTests.cs rename to dotnet/src/SemanticKernel.UnitTests/AI/Embeddings/EmbeddingTests.cs index 4903d6a110bc..c6117f1c75cc 100644 --- a/dotnet/src/SemanticKernel.Test/AI/Embeddings/EmbeddingTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/AI/Embeddings/EmbeddingTests.cs @@ -7,7 +7,7 @@ using Microsoft.SemanticKernel.Diagnostics; using Xunit; -namespace SemanticKernelTests.AI.Embeddings; +namespace SemanticKernel.UnitTests.AI.Embeddings; public class EmbeddingTests { diff --git a/dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/AzureOpenAIConfigTests.cs b/dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/AzureOpenAIConfigTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/AzureOpenAIConfigTests.cs rename to dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/AzureOpenAIConfigTests.cs index abe323dc7496..7f0c33820c05 100644 --- a/dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/AzureOpenAIConfigTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/AzureOpenAIConfigTests.cs @@ -4,7 +4,7 @@ using Microsoft.SemanticKernel.Diagnostics; using Xunit; -namespace SemanticKernelTests.AI.OpenAI.Services; +namespace SemanticKernel.UnitTests.AI.OpenAI.Services; public class AzureOpenAIConfigTests { diff --git a/dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/BackendConfigTests.cs b/dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/BackendConfigTests.cs similarity index 94% rename from dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/BackendConfigTests.cs rename to dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/BackendConfigTests.cs index b4e6e1404104..3f93cff683f0 100644 --- a/dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/BackendConfigTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/BackendConfigTests.cs @@ -4,7 +4,7 @@ using Microsoft.SemanticKernel.Diagnostics; using Xunit; -namespace SemanticKernelTests.AI.OpenAI.Services; +namespace SemanticKernel.UnitTests.AI.OpenAI.Services; public class BackendConfigTests { diff --git a/dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/OpenAIConfigTests.cs b/dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/OpenAIConfigTests.cs similarity index 96% rename from dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/OpenAIConfigTests.cs rename to dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/OpenAIConfigTests.cs index 6a187206541c..c7bdb1b6a045 100644 --- a/dotnet/src/SemanticKernel.Test/AI/OpenAI/Services/OpenAIConfigTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/AI/OpenAI/Services/OpenAIConfigTests.cs @@ -4,7 +4,7 @@ using Microsoft.SemanticKernel.Diagnostics; using Xunit; -namespace SemanticKernelTests.AI.OpenAI.Services; +namespace SemanticKernel.UnitTests.AI.OpenAI.Services; /// /// Unit tests of diff --git a/dotnet/src/SemanticKernel.Test/Configuration/KernelConfigTests.cs b/dotnet/src/SemanticKernel.UnitTests/Configuration/KernelConfigTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/Configuration/KernelConfigTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Configuration/KernelConfigTests.cs index 3dc94106a6fb..43d94bfbc2cb 100644 --- a/dotnet/src/SemanticKernel.Test/Configuration/KernelConfigTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Configuration/KernelConfigTests.cs @@ -8,7 +8,7 @@ using Moq; using Xunit; -namespace SemanticKernelTests.Configuration; +namespace SemanticKernel.UnitTests.Configuration; /// /// Unit tests of . diff --git a/dotnet/src/SemanticKernel.Test/CoreSkills/FileIOSkillTests.cs b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/FileIOSkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Test/CoreSkills/FileIOSkillTests.cs rename to dotnet/src/SemanticKernel.UnitTests/CoreSkills/FileIOSkillTests.cs index d5827af6f7b7..f617856a5930 100644 --- a/dotnet/src/SemanticKernel.Test/CoreSkills/FileIOSkillTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/FileIOSkillTests.cs @@ -10,7 +10,7 @@ using Microsoft.SemanticKernel.Orchestration; using Xunit; -namespace SemanticKernelTests.CoreSkills; +namespace SemanticKernel.UnitTests.CoreSkills; public class FileIOSkillTests { diff --git a/dotnet/src/SemanticKernel.Test/CoreSkills/HttpSkillTests.cs b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/HttpSkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Test/CoreSkills/HttpSkillTests.cs rename to dotnet/src/SemanticKernel.UnitTests/CoreSkills/HttpSkillTests.cs index b944d401f039..f697a255c0f9 100644 --- a/dotnet/src/SemanticKernel.Test/CoreSkills/HttpSkillTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/HttpSkillTests.cs @@ -14,7 +14,7 @@ using Moq.Protected; using Xunit; -namespace SemanticKernelTests.CoreSkills; +namespace SemanticKernel.UnitTests.CoreSkills; public class HttpSkillTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Test/CoreSkills/PlannerSkillTests.cs b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/PlannerSkillTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/CoreSkills/PlannerSkillTests.cs rename to dotnet/src/SemanticKernel.UnitTests/CoreSkills/PlannerSkillTests.cs index 0820a0bb5f12..36a9c476eef6 100644 --- a/dotnet/src/SemanticKernel.Test/CoreSkills/PlannerSkillTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/PlannerSkillTests.cs @@ -11,7 +11,7 @@ using Xunit; using Xunit.Abstractions; -namespace SemanticKernelTests.CoreSkills; +namespace SemanticKernel.UnitTests.CoreSkills; public class PlannerSkillTests { diff --git a/dotnet/src/SemanticKernel.Test/CoreSkills/TextSkillTests.cs b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TextSkillTests.cs similarity index 97% rename from dotnet/src/SemanticKernel.Test/CoreSkills/TextSkillTests.cs rename to dotnet/src/SemanticKernel.UnitTests/CoreSkills/TextSkillTests.cs index fe79ecc12bbe..69a32a754a7b 100644 --- a/dotnet/src/SemanticKernel.Test/CoreSkills/TextSkillTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TextSkillTests.cs @@ -4,7 +4,7 @@ using Microsoft.SemanticKernel.CoreSkills; using Xunit; -namespace SemanticKernelTests.CoreSkills; +namespace SemanticKernel.UnitTests.CoreSkills; public class TextSkillTests { diff --git a/dotnet/src/SemanticKernel.Test/CoreSkills/TimeSkillTests.cs b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TimeSkillTests.cs similarity index 92% rename from dotnet/src/SemanticKernel.Test/CoreSkills/TimeSkillTests.cs rename to dotnet/src/SemanticKernel.UnitTests/CoreSkills/TimeSkillTests.cs index ec47b1835499..b6a22b2aedc2 100644 --- a/dotnet/src/SemanticKernel.Test/CoreSkills/TimeSkillTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/CoreSkills/TimeSkillTests.cs @@ -4,7 +4,7 @@ using Microsoft.SemanticKernel.CoreSkills; using Xunit; -namespace SemanticKernelTests.CoreSkills; +namespace SemanticKernel.UnitTests.CoreSkills; // TODO: allow clock injection and test all functions public class TimeSkillTests diff --git a/dotnet/src/SemanticKernel.Test/KernelTests.cs b/dotnet/src/SemanticKernel.UnitTests/KernelTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/KernelTests.cs rename to dotnet/src/SemanticKernel.UnitTests/KernelTests.cs index 210d3df0e859..0f638fc2efa2 100644 --- a/dotnet/src/SemanticKernel.Test/KernelTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/KernelTests.cs @@ -13,7 +13,7 @@ // ReSharper disable StringLiteralTypo -namespace SemanticKernelTests; +namespace SemanticKernel.UnitTests; public class KernelTests { diff --git a/dotnet/src/SemanticKernel.Test/Memory/Storage/DataEntryTests.cs b/dotnet/src/SemanticKernel.UnitTests/Memory/Storage/DataEntryTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/Memory/Storage/DataEntryTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Memory/Storage/DataEntryTests.cs index a6fcbd8c7986..414a978dc322 100644 --- a/dotnet/src/SemanticKernel.Test/Memory/Storage/DataEntryTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Memory/Storage/DataEntryTests.cs @@ -5,7 +5,7 @@ using Microsoft.SemanticKernel.Memory.Storage; using Xunit; -namespace SemanticKernelTests.Memory.Storage; +namespace SemanticKernel.UnitTests.Memory.Storage; /// /// Unit tests of . diff --git a/dotnet/src/SemanticKernel.Test/Memory/Storage/VolatileDataStoreTests.cs b/dotnet/src/SemanticKernel.UnitTests/Memory/Storage/VolatileDataStoreTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/Memory/Storage/VolatileDataStoreTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Memory/Storage/VolatileDataStoreTests.cs index 503984811787..1a747efa7c07 100644 --- a/dotnet/src/SemanticKernel.Test/Memory/Storage/VolatileDataStoreTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Memory/Storage/VolatileDataStoreTests.cs @@ -6,7 +6,7 @@ using Microsoft.SemanticKernel.Memory.Storage; using Xunit; -namespace SemanticKernelTests.Memory.Storage; +namespace SemanticKernel.UnitTests.Memory.Storage; /// /// Unit tests of . diff --git a/dotnet/src/SemanticKernel.Test/Memory/VolatileMemoryStoreTests.cs b/dotnet/src/SemanticKernel.UnitTests/Memory/VolatileMemoryStoreTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/Memory/VolatileMemoryStoreTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Memory/VolatileMemoryStoreTests.cs index a2a492305a26..11e2baaf341e 100644 --- a/dotnet/src/SemanticKernel.Test/Memory/VolatileMemoryStoreTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Memory/VolatileMemoryStoreTests.cs @@ -8,7 +8,7 @@ using Microsoft.SemanticKernel.Memory.Storage; using Xunit; -namespace SemanticKernelTests.Memory; +namespace SemanticKernel.UnitTests.Memory; internal class DoubleEmbeddingWithBasicMetadata : IEmbeddingWithMetadata { diff --git a/dotnet/src/SemanticKernel.Test/Orchestration/ContextVariablesTests.cs b/dotnet/src/SemanticKernel.UnitTests/Orchestration/ContextVariablesTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Test/Orchestration/ContextVariablesTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Orchestration/ContextVariablesTests.cs index 1fc9a93f0a7d..b348d5c6a5a0 100644 --- a/dotnet/src/SemanticKernel.Test/Orchestration/ContextVariablesTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Orchestration/ContextVariablesTests.cs @@ -6,7 +6,7 @@ using Microsoft.SemanticKernel.Orchestration; using Xunit; -namespace SemanticKernelTests.Orchestration; +namespace SemanticKernel.UnitTests.Orchestration; /// /// Unit tests of . diff --git a/dotnet/src/SemanticKernel.Test/Orchestration/SKContextTests.cs b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKContextTests.cs similarity index 97% rename from dotnet/src/SemanticKernel.Test/Orchestration/SKContextTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Orchestration/SKContextTests.cs index 565b2bb9c145..a9bf7828a0a9 100644 --- a/dotnet/src/SemanticKernel.Test/Orchestration/SKContextTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKContextTests.cs @@ -11,7 +11,7 @@ using Moq; using Xunit; -namespace SemanticKernelTests.Orchestration; +namespace SemanticKernel.UnitTests.Orchestration; public class SKContextTests { diff --git a/dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests1.cs b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests1.cs similarity index 96% rename from dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests1.cs rename to dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests1.cs index 3bc6273ff970..a1cfb26dc567 100644 --- a/dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests1.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests1.cs @@ -7,11 +7,11 @@ using Microsoft.SemanticKernel.SemanticFunctions; using Microsoft.SemanticKernel.SkillDefinition; using Moq; -using SemanticKernelTests.XunitHelpers; +using SemanticKernel.UnitTests.XunitHelpers; using Xunit; using Xunit.Abstractions; -namespace SemanticKernelTests.Orchestration; +namespace SemanticKernel.UnitTests.Orchestration; public sealed class SKFunctionTests1 : IDisposable { diff --git a/dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests2.cs b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests2.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests2.cs rename to dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests2.cs index 02e3612a8a14..4e53f20fe7de 100644 --- a/dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests2.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests2.cs @@ -9,11 +9,11 @@ using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.SkillDefinition; using Moq; -using SemanticKernelTests.XunitHelpers; +using SemanticKernel.UnitTests.XunitHelpers; using Xunit; using Xunit.Abstractions; -namespace SemanticKernelTests.Orchestration; +namespace SemanticKernel.UnitTests.Orchestration; public sealed class SKFunctionTests2 : IDisposable { diff --git a/dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests3.cs b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests3.cs similarity index 98% rename from dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests3.cs rename to dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests3.cs index a6851573b215..acd4fe49270c 100644 --- a/dotnet/src/SemanticKernel.Test/Orchestration/SKFunctionTests3.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Orchestration/SKFunctionTests3.cs @@ -9,11 +9,11 @@ using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.SkillDefinition; -using SemanticKernelTests.XunitHelpers; +using SemanticKernel.UnitTests.XunitHelpers; using Xunit; using Xunit.Abstractions; -namespace SemanticKernelTests.Orchestration; +namespace SemanticKernel.UnitTests.Orchestration; [SuppressMessage("", "CA1812:internal class apparently never instantiated", Justification = "Classes required by tests")] public sealed class SKFunctionTests3 : IDisposable diff --git a/dotnet/src/SemanticKernel.Test/Reliability/PassThroughWithoutRetryTests.cs b/dotnet/src/SemanticKernel.UnitTests/Reliability/PassThroughWithoutRetryTests.cs similarity index 97% rename from dotnet/src/SemanticKernel.Test/Reliability/PassThroughWithoutRetryTests.cs rename to dotnet/src/SemanticKernel.UnitTests/Reliability/PassThroughWithoutRetryTests.cs index 85f905d70f77..098fe632f754 100644 --- a/dotnet/src/SemanticKernel.Test/Reliability/PassThroughWithoutRetryTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/Reliability/PassThroughWithoutRetryTests.cs @@ -9,7 +9,7 @@ using Moq; using Xunit; -namespace SemanticKernelTests.Reliability; +namespace SemanticKernel.UnitTests.Reliability; public class PassThroughWithoutRetryTests { diff --git a/dotnet/src/SemanticKernel.Test/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs b/dotnet/src/SemanticKernel.UnitTests/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs rename to dotnet/src/SemanticKernel.UnitTests/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs index eb5a9d95d8b2..1bd3e508412f 100644 --- a/dotnet/src/SemanticKernel.Test/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/SemanticFunctions/Partitioning/SemanticTextPartitionerTests.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; using Microsoft.SemanticKernel.SemanticFunctions.Partitioning; -using SemanticKernelTests.XunitHelpers; +using SemanticKernel.UnitTests.XunitHelpers; using Xunit; using Xunit.Abstractions; -namespace SemanticKernelTests.SemanticFunctions.Partitioning; +namespace SemanticKernel.UnitTests.SemanticFunctions.Partitioning; public sealed class SemanticTextPartitionerTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Test/SemanticKernel.Test.csproj b/dotnet/src/SemanticKernel.UnitTests/SemanticKernel.UnitTests.csproj similarity index 89% rename from dotnet/src/SemanticKernel.Test/SemanticKernel.Test.csproj rename to dotnet/src/SemanticKernel.UnitTests/SemanticKernel.UnitTests.csproj index df186b02808c..e33552ff1201 100644 --- a/dotnet/src/SemanticKernel.Test/SemanticKernel.Test.csproj +++ b/dotnet/src/SemanticKernel.UnitTests/SemanticKernel.UnitTests.csproj @@ -1,8 +1,8 @@  - SemanticKernelTests - SemanticKernelTests + SemanticKernel.UnitTests + SemanticKernel.UnitTests net6.0 false diff --git a/dotnet/src/SemanticKernel.Test/SkillDefinition/FunctionsViewTests.cs b/dotnet/src/SemanticKernel.UnitTests/SkillDefinition/FunctionsViewTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Test/SkillDefinition/FunctionsViewTests.cs rename to dotnet/src/SemanticKernel.UnitTests/SkillDefinition/FunctionsViewTests.cs index c15ab2ec6669..337310310f5b 100644 --- a/dotnet/src/SemanticKernel.Test/SkillDefinition/FunctionsViewTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/SkillDefinition/FunctionsViewTests.cs @@ -6,7 +6,7 @@ using Microsoft.SemanticKernel.SkillDefinition; using Xunit; -namespace SemanticKernelTests.SkillDefinition; +namespace SemanticKernel.UnitTests.SkillDefinition; public class FunctionsViewTests { diff --git a/dotnet/src/SemanticKernel.Test/TemplateEngine/Blocks/CodeBlockTests.cs b/dotnet/src/SemanticKernel.UnitTests/TemplateEngine/Blocks/CodeBlockTests.cs similarity index 97% rename from dotnet/src/SemanticKernel.Test/TemplateEngine/Blocks/CodeBlockTests.cs rename to dotnet/src/SemanticKernel.UnitTests/TemplateEngine/Blocks/CodeBlockTests.cs index 031a1e31ddd3..f08fef25ce8d 100644 --- a/dotnet/src/SemanticKernel.Test/TemplateEngine/Blocks/CodeBlockTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/TemplateEngine/Blocks/CodeBlockTests.cs @@ -13,7 +13,7 @@ using Moq; using Xunit; -namespace SemanticKernelTests.TemplateEngine.Blocks; +namespace SemanticKernel.UnitTests.TemplateEngine.Blocks; public class CodeBlockTests { diff --git a/dotnet/src/SemanticKernel.Test/TemplateEngine/PromptTemplateEngineTests.cs b/dotnet/src/SemanticKernel.UnitTests/TemplateEngine/PromptTemplateEngineTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/TemplateEngine/PromptTemplateEngineTests.cs rename to dotnet/src/SemanticKernel.UnitTests/TemplateEngine/PromptTemplateEngineTests.cs index 6db0285a433d..d23702689572 100644 --- a/dotnet/src/SemanticKernel.Test/TemplateEngine/PromptTemplateEngineTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/TemplateEngine/PromptTemplateEngineTests.cs @@ -9,11 +9,11 @@ using Microsoft.SemanticKernel.TemplateEngine; using Microsoft.SemanticKernel.TemplateEngine.Blocks; using Moq; -using SemanticKernelTests.XunitHelpers; +using SemanticKernel.UnitTests.XunitHelpers; using Xunit; using Xunit.Abstractions; -namespace SemanticKernelTests.TemplateEngine; +namespace SemanticKernel.UnitTests.TemplateEngine; public sealed class TemplateEngineTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Test/VectorOperations/VectorOperationTests.cs b/dotnet/src/SemanticKernel.UnitTests/VectorOperations/VectorOperationTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/VectorOperations/VectorOperationTests.cs rename to dotnet/src/SemanticKernel.UnitTests/VectorOperations/VectorOperationTests.cs index 269d4ad32afa..336c90efb97f 100644 --- a/dotnet/src/SemanticKernel.Test/VectorOperations/VectorOperationTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/VectorOperations/VectorOperationTests.cs @@ -7,7 +7,7 @@ using Microsoft.SemanticKernel.AI.Embeddings.VectorOperations; using Xunit; -namespace SemanticKernelTests.VectorOperations; +namespace SemanticKernel.UnitTests.VectorOperations; public class VectorOperationTests { diff --git a/dotnet/src/SemanticKernel.Test/VectorOperations/VectorSpanTests.cs b/dotnet/src/SemanticKernel.UnitTests/VectorOperations/VectorSpanTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Test/VectorOperations/VectorSpanTests.cs rename to dotnet/src/SemanticKernel.UnitTests/VectorOperations/VectorSpanTests.cs index 113fc0c24f7b..ade6edaf7f6b 100644 --- a/dotnet/src/SemanticKernel.Test/VectorOperations/VectorSpanTests.cs +++ b/dotnet/src/SemanticKernel.UnitTests/VectorOperations/VectorSpanTests.cs @@ -4,7 +4,7 @@ using Microsoft.SemanticKernel.AI.Embeddings; using Xunit; -namespace SemanticKernelTests.VectorOperations; +namespace SemanticKernel.UnitTests.VectorOperations; public class VectorSpanTests { diff --git a/dotnet/src/SemanticKernel.Test/XunitHelpers/ConsoleLogger.cs b/dotnet/src/SemanticKernel.UnitTests/XunitHelpers/ConsoleLogger.cs similarity index 95% rename from dotnet/src/SemanticKernel.Test/XunitHelpers/ConsoleLogger.cs rename to dotnet/src/SemanticKernel.UnitTests/XunitHelpers/ConsoleLogger.cs index 069acffd8de4..12c931df64b2 100644 --- a/dotnet/src/SemanticKernel.Test/XunitHelpers/ConsoleLogger.cs +++ b/dotnet/src/SemanticKernel.UnitTests/XunitHelpers/ConsoleLogger.cs @@ -3,7 +3,7 @@ using System; using Microsoft.Extensions.Logging; -namespace SemanticKernelTests.XunitHelpers; +namespace SemanticKernel.UnitTests.XunitHelpers; /// /// Basic logger printing to console diff --git a/dotnet/src/SemanticKernel.Test/XunitHelpers/RedirectOutput.cs b/dotnet/src/SemanticKernel.UnitTests/XunitHelpers/RedirectOutput.cs similarity index 90% rename from dotnet/src/SemanticKernel.Test/XunitHelpers/RedirectOutput.cs rename to dotnet/src/SemanticKernel.UnitTests/XunitHelpers/RedirectOutput.cs index 96e860e60660..20a4520ee459 100644 --- a/dotnet/src/SemanticKernel.Test/XunitHelpers/RedirectOutput.cs +++ b/dotnet/src/SemanticKernel.UnitTests/XunitHelpers/RedirectOutput.cs @@ -4,7 +4,7 @@ using System.Text; using Xunit.Abstractions; -namespace SemanticKernelTests.XunitHelpers; +namespace SemanticKernel.UnitTests.XunitHelpers; public class RedirectOutput : TextWriter { diff --git a/dotnet/src/SemanticKernel/SemanticKernel.csproj b/dotnet/src/SemanticKernel/SemanticKernel.csproj index e22aa0fba3ce..6d8cc6ba880c 100644 --- a/dotnet/src/SemanticKernel/SemanticKernel.csproj +++ b/dotnet/src/SemanticKernel/SemanticKernel.csproj @@ -37,7 +37,7 @@ - <_Parameter1>SemanticKernelTests + <_Parameter1>SemanticKernel.UnitTests \ No newline at end of file From dd89117bb49cee852f8757ac56a6843cdfa541cc Mon Sep 17 00:00:00 2001 From: Dmytro Struk Date: Mon, 13 Mar 2023 08:50:49 +0000 Subject: [PATCH 3/4] Updated skills test project name --- dotnet/SK-dotnet.sln | 2 +- .../Document/DocumentSkillTests.cs | 2 +- .../Memory/Sqlite/SqliteMemoryStoreTests.cs | 2 +- .../MsGraph/CalendarSkillTests.cs | 2 +- .../MsGraph/CloudDriveSkillTests.cs | 2 +- .../MsGraph/EmailSkillTests.cs | 2 +- .../MsGraph/OrganizationHierarchySkillTests.cs | 2 +- .../MsGraph/TaskListSkillTests.cs | 2 +- .../Skills.UnitTests.csproj} | 4 ++-- .../Web/SearchUrlSkillTests.cs | 2 +- .../Web/WebSearchEngineSkillTests.cs | 2 +- .../{Skills.Test => Skills.UnitTests}/XunitLogger.cs | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/Document/DocumentSkillTests.cs (99%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/Memory/Sqlite/SqliteMemoryStoreTests.cs (99%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/MsGraph/CalendarSkillTests.cs (99%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/MsGraph/CloudDriveSkillTests.cs (98%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/MsGraph/EmailSkillTests.cs (98%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/MsGraph/OrganizationHierarchySkillTests.cs (98%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/MsGraph/TaskListSkillTests.cs (98%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test/Skills.Test.csproj => Skills.UnitTests/Skills.UnitTests.csproj} (89%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/Web/SearchUrlSkillTests.cs (98%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/Web/WebSearchEngineSkillTests.cs (96%) rename dotnet/src/SemanticKernel.Skills/{Skills.Test => Skills.UnitTests}/XunitLogger.cs (96%) diff --git a/dotnet/SK-dotnet.sln b/dotnet/SK-dotnet.sln index 3fe7345cdccf..bbdf5984aec2 100644 --- a/dotnet/SK-dotnet.sln +++ b/dotnet/SK-dotnet.sln @@ -41,7 +41,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skills.Memory.Sqlite", "src EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skills", "skills", "{9ECD1AA0-75B3-4E25-B0B5-9F0945B64974}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skills.Test", "src\SemanticKernel.Skills\Skills.Test\Skills.Test.csproj", "{107156B4-5A8B-45C7-97A2-4544D7FA19DE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skills.UnitTests", "src\SemanticKernel.Skills\Skills.UnitTests\Skills.UnitTests.csproj", "{107156B4-5A8B-45C7-97A2-4544D7FA19DE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{F4243136-252A-4459-A7C4-EE8C056D6B0B}" ProjectSection(SolutionItems) = preProject diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/Document/DocumentSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Document/DocumentSkillTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/Document/DocumentSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Document/DocumentSkillTests.cs index b1242fa95c4c..5827954443d3 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/Document/DocumentSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Document/DocumentSkillTests.cs @@ -13,7 +13,7 @@ using Xunit; using static Microsoft.SemanticKernel.Skills.Document.DocumentSkill; -namespace SemanticKernelSkills.Test.Document; +namespace SemanticKernel.Skills.UnitTests.Document; public class DocumentSkillTests { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/Memory/Sqlite/SqliteMemoryStoreTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Memory/Sqlite/SqliteMemoryStoreTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/Memory/Sqlite/SqliteMemoryStoreTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Memory/Sqlite/SqliteMemoryStoreTests.cs index 187e531b9330..e0644812f7cb 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/Memory/Sqlite/SqliteMemoryStoreTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Memory/Sqlite/SqliteMemoryStoreTests.cs @@ -9,7 +9,7 @@ using Microsoft.SemanticKernel.Skills.Memory.Sqlite; using Xunit; -namespace SemanticKernelSkills.Test.Memory.Sqlite; +namespace SemanticKernel.Skills.UnitTests.Memory.Sqlite; /// /// Unit tests of . diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/CalendarSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/CalendarSkillTests.cs similarity index 99% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/CalendarSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/CalendarSkillTests.cs index 51bc041f5b6a..7faf90ed7e77 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/CalendarSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/CalendarSkillTests.cs @@ -13,7 +13,7 @@ using Xunit.Abstractions; using static Microsoft.SemanticKernel.Skills.MsGraph.CalendarSkill; -namespace SemanticKernelSkills.Test.MsGraph; +namespace SemanticKernel.Skills.UnitTests.MsGraph; public class CalendarSkillTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/CloudDriveSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/CloudDriveSkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/CloudDriveSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/CloudDriveSkillTests.cs index 73a8b49216ff..06e39a64769c 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/CloudDriveSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/CloudDriveSkillTests.cs @@ -13,7 +13,7 @@ using Xunit.Abstractions; using static Microsoft.SemanticKernel.Skills.MsGraph.CloudDriveSkill; -namespace SemanticKernelSkills.Test.MsGraph; +namespace SemanticKernel.Skills.UnitTests.MsGraph; public class CloudDriveSkillTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/EmailSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/EmailSkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/EmailSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/EmailSkillTests.cs index bcc276187aac..f34be8eaebd1 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/EmailSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/EmailSkillTests.cs @@ -11,7 +11,7 @@ using Xunit; using static Microsoft.SemanticKernel.Skills.MsGraph.EmailSkill; -namespace SemanticKernelSkills.Test.MsGraph; +namespace SemanticKernel.Skills.UnitTests.MsGraph; public class EmailSkillTests { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/OrganizationHierarchySkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/OrganizationHierarchySkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/OrganizationHierarchySkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/OrganizationHierarchySkillTests.cs index b9800ff4baec..e5bb4c0dcf28 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/OrganizationHierarchySkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/OrganizationHierarchySkillTests.cs @@ -10,7 +10,7 @@ using Xunit; using Xunit.Abstractions; -namespace SemanticKernelSkills.Test.MsGraph; +namespace SemanticKernel.Skills.UnitTests.MsGraph; public class OrganizationHierarchySkillTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/TaskListSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/TaskListSkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/TaskListSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/TaskListSkillTests.cs index 7067d5f2d2cc..808ee3051608 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/MsGraph/TaskListSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/MsGraph/TaskListSkillTests.cs @@ -12,7 +12,7 @@ using Xunit; using static Microsoft.SemanticKernel.Skills.MsGraph.TaskListSkill; -namespace SemanticKernelSkills.Test.MsGraph; +namespace SemanticKernel.Skills.UnitTests.MsGraph; public class TaskListSkillTests { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/Skills.Test.csproj b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Skills.UnitTests.csproj similarity index 89% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/Skills.Test.csproj rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Skills.UnitTests.csproj index 7ff3f9e252f5..df8279149401 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/Skills.Test.csproj +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Skills.UnitTests.csproj @@ -1,8 +1,8 @@  - SemanticKernelSkills.Test - SemanticKernelSkills.Test + SemanticKernel.Skills.UnitTests + SemanticKernel.Skills.UnitTests net6.0 10 enable diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/Web/SearchUrlSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Web/SearchUrlSkillTests.cs similarity index 98% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/Web/SearchUrlSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Web/SearchUrlSkillTests.cs index 15e23d0cd26d..041137150b8c 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/Web/SearchUrlSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Web/SearchUrlSkillTests.cs @@ -5,7 +5,7 @@ using Microsoft.SemanticKernel.Skills.Web; using Xunit; -namespace SemanticKernelSkills.Test.Web; +namespace SemanticKernel.Skills.UnitTests.Web; public class SearchUrlSkillTests { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/Web/WebSearchEngineSkillTests.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Web/WebSearchEngineSkillTests.cs similarity index 96% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/Web/WebSearchEngineSkillTests.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Web/WebSearchEngineSkillTests.cs index c2008f755f62..ca66de4d2cfc 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/Web/WebSearchEngineSkillTests.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/Web/WebSearchEngineSkillTests.cs @@ -10,7 +10,7 @@ using Xunit; using Xunit.Abstractions; -namespace SemanticKernelSkills.Test.Web; +namespace SemanticKernel.Skills.UnitTests.Web; public sealed class WebSearchEngineSkillTests : IDisposable { diff --git a/dotnet/src/SemanticKernel.Skills/Skills.Test/XunitLogger.cs b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/XunitLogger.cs similarity index 96% rename from dotnet/src/SemanticKernel.Skills/Skills.Test/XunitLogger.cs rename to dotnet/src/SemanticKernel.Skills/Skills.UnitTests/XunitLogger.cs index bba63b3850f5..05195268928a 100644 --- a/dotnet/src/SemanticKernel.Skills/Skills.Test/XunitLogger.cs +++ b/dotnet/src/SemanticKernel.Skills/Skills.UnitTests/XunitLogger.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace SemanticKernelSkills.Test; +namespace SemanticKernel.Skills.UnitTests; /// /// A logger that writes to the Xunit test output From 3591d6f6c715720167e0dffc2862af915cfa47b6 Mon Sep 17 00:00:00 2001 From: Dmytro Struk Date: Mon, 13 Mar 2023 08:51:27 +0000 Subject: [PATCH 4/4] Small update in integration tests pipeline --- .github/workflows/dotnet-integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-integration-tests.yml b/.github/workflows/dotnet-integration-tests.yml index 80a46788730c..25f48cdefe05 100644 --- a/.github/workflows/dotnet-integration-tests.yml +++ b/.github/workflows/dotnet-integration-tests.yml @@ -31,7 +31,7 @@ jobs: - name: Find projects shell: bash - run: echo "projects=$(find ./dotnet -type f -name "*IntegrationTests.csproj" | tr '\n' ' ')" >> $GITHUB_ENV + run: echo "projects=$(find ./dotnet -type f -name "*.IntegrationTests.csproj" | tr '\n' ' ')" >> $GITHUB_ENV - name: Integration Tests shell: bash