prep work to transfer to ml.net (dotnet#389)

* move test projects to top level test subdir * rename some projects to make naming consistent and make it build again * fix test project refs
Dmitry-A · Apr 12, 2019 · 553e089 · 553e089
1 parent 5227ee5
commit 553e089
Show file tree

Hide file tree

Showing 52 changed files with 16 additions and 18 deletions.
diff --git a/AutoML.sln b/AutoML.sln
@@ -5,13 +5,11 @@ VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Auto", "src\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj", "{B3727729-3DF8-47E0-8710-9B41DAF55817}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples", "src\Samples\Samples.csproj", "{64A7294E-A2C7-4499-8F0B-4BB074047C6B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "src\Test\Test.csproj", "{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutoML.Tests", "test\Microsoft.ML.AutoML.Tests\Microsoft.ML.AutoML.Tests.csproj", "{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet", "src\mlnet\mlnet.csproj", "{ED714FA5-6F89-401B-9E7F-CADF1373C553}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet.Test", "src\mlnet.Test\mlnet.Test.csproj", "{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet.Tests", "test\mlnet.Tests\mlnet.Tests.csproj", "{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/build.proj b/build.proj
@@ -93,8 +93,8 @@
   </Target>-->
 
   <Target Name="RunTests">
-    <MSBuild Projects="src\Test\run-tests.proj" Targets="RunTests" />
-    <MSBuild Projects="src\mlnet.Test\run-tests.proj" Targets="RunTests" />
+    <MSBuild Projects="test\Microsoft.ML.AutoML.Tests\run-tests.proj" Targets="RunTests" />
+    <MSBuild Projects="test\mlnet.Tests\run-tests.proj" Targets="RunTests" />
   </Target>
 
   <!-- Override CleanAllProjects from dir.traversal.targets and just remove the full BinDir -->

diff --git a/src/Microsoft.ML.Auto/Assembly.cs b/src/Microsoft.ML.Auto/Assembly.cs
@@ -4,7 +4,7 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("Microsoft.ML.AutoML.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
 [assembly: InternalsVisibleTo("mlnet, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
-[assembly: InternalsVisibleTo("mlnet.Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("mlnet.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
 [assembly: InternalsVisibleTo("Benchmark, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
diff --git a/src/mlnet/Assembly.cs b/src/mlnet/Assembly.cs
@@ -4,4 +4,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("mlnet.Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("mlnet.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
diff --git a/src/Test/AutoFitTests.cs → ...Microsoft.ML.AutoML.Tests/AutoFitTests.cs b/src/Test/AutoFitTests.cs → ...Microsoft.ML.AutoML.Tests/AutoFitTests.cs
diff --git a/src/Test/BestResultUtilTests.cs → ...ft.ML.AutoML.Tests/BestResultUtilTests.cs b/src/Test/BestResultUtilTests.cs → ...ft.ML.AutoML.Tests/BestResultUtilTests.cs
diff --git a/src/Test/ColumnInferenceTests.cs → ...t.ML.AutoML.Tests/ColumnInferenceTests.cs b/src/Test/ColumnInferenceTests.cs → ...t.ML.AutoML.Tests/ColumnInferenceTests.cs
diff --git a/src/Test/ColumnInformationUtilTests.cs → ...utoML.Tests/ColumnInformationUtilTests.cs b/src/Test/ColumnInformationUtilTests.cs → ...utoML.Tests/ColumnInformationUtilTests.cs
diff --git a/src/Test/ConversionTests.cs → ...rosoft.ML.AutoML.Tests/ConversionTests.cs b/src/Test/ConversionTests.cs → ...rosoft.ML.AutoML.Tests/ConversionTests.cs
diff --git a/src/Test/DatasetDimensionsTests.cs → ...ML.AutoML.Tests/DatasetDimensionsTests.cs b/src/Test/DatasetDimensionsTests.cs → ...ML.AutoML.Tests/DatasetDimensionsTests.cs
diff --git a/src/Test/DatasetUtil.cs → .../Microsoft.ML.AutoML.Tests/DatasetUtil.cs b/src/Test/DatasetUtil.cs → .../Microsoft.ML.AutoML.Tests/DatasetUtil.cs
diff --git a/src/Test/Directory.Build.props → ...oft.ML.AutoML.Tests/Directory.Build.props b/src/Test/Directory.Build.props → ...oft.ML.AutoML.Tests/Directory.Build.props
diff --git a/src/Test/EstimatorExtensionTests.cs → ...L.AutoML.Tests/EstimatorExtensionTests.cs b/src/Test/EstimatorExtensionTests.cs → ...L.AutoML.Tests/EstimatorExtensionTests.cs
diff --git a/src/Test/GetNextPipelineTests.cs → ...t.ML.AutoML.Tests/GetNextPipelineTests.cs b/src/Test/GetNextPipelineTests.cs → ...t.ML.AutoML.Tests/GetNextPipelineTests.cs
diff --git a/src/Test/InferredPipelineTests.cs → ....ML.AutoML.Tests/InferredPipelineTests.cs b/src/Test/InferredPipelineTests.cs → ....ML.AutoML.Tests/InferredPipelineTests.cs
diff --git a/src/Test/MetricsAgentsTests.cs → ...oft.ML.AutoML.Tests/MetricsAgentsTests.cs b/src/Test/MetricsAgentsTests.cs → ...oft.ML.AutoML.Tests/MetricsAgentsTests.cs
diff --git a/src/Test/MetricsUtil.cs → .../Microsoft.ML.AutoML.Tests/MetricsUtil.cs b/src/Test/MetricsUtil.cs → .../Microsoft.ML.AutoML.Tests/MetricsUtil.cs
diff --git a/src/Test/Test.csproj → ...ML.Tests/Microsoft.ML.AutoML.Tests.csproj b/src/Test/Test.csproj → ...ML.Tests/Microsoft.ML.AutoML.Tests.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Test/PurposeInferenceTests.cs → ....ML.AutoML.Tests/PurposeInferenceTests.cs b/src/Test/PurposeInferenceTests.cs → ....ML.AutoML.Tests/PurposeInferenceTests.cs
diff --git a/src/Test/SuggestedPipelineBuilderTests.cs → ...ML.Tests/SuggestedPipelineBuilderTests.cs b/src/Test/SuggestedPipelineBuilderTests.cs → ...ML.Tests/SuggestedPipelineBuilderTests.cs
diff --git a/src/Test/SweeperTests.cs → ...Microsoft.ML.AutoML.Tests/SweeperTests.cs b/src/Test/SweeperTests.cs → ...Microsoft.ML.AutoML.Tests/SweeperTests.cs
diff --git a/.../TestData/BinaryDatasetWithBoolColumn.txt → .../TestData/BinaryDatasetWithBoolColumn.txt b/.../TestData/BinaryDatasetWithBoolColumn.txt → .../TestData/BinaryDatasetWithBoolColumn.txt
diff --git a/...estData/DatasetWithDefaultColumnNames.txt → ...estData/DatasetWithDefaultColumnNames.txt b/...estData/DatasetWithDefaultColumnNames.txt → ...estData/DatasetWithDefaultColumnNames.txt
diff --git a/src/Test/TestData/DatasetWithEmptyColumn.txt → ...Tests/TestData/DatasetWithEmptyColumn.txt b/src/Test/TestData/DatasetWithEmptyColumn.txt → ...Tests/TestData/DatasetWithEmptyColumn.txt
diff --git a/...stData/NameColumnIsOnlyFeatureDataset.txt → ...stData/NameColumnIsOnlyFeatureDataset.txt b/...stData/NameColumnIsOnlyFeatureDataset.txt → ...stData/NameColumnIsOnlyFeatureDataset.txt
diff --git a/...est/TestData/TrivialMulticlassDataset.txt → ...sts/TestData/TrivialMulticlassDataset.txt b/...est/TestData/TrivialMulticlassDataset.txt → ...sts/TestData/TrivialMulticlassDataset.txt
diff --git a/src/Test/TextFileSampleTests.cs → ...ft.ML.AutoML.Tests/TextFileSampleTests.cs b/src/Test/TextFileSampleTests.cs → ...ft.ML.AutoML.Tests/TextFileSampleTests.cs
diff --git a/src/Test/TrainerExtensionsTests.cs → ...ML.AutoML.Tests/TrainerExtensionsTests.cs b/src/Test/TrainerExtensionsTests.cs → ...ML.AutoML.Tests/TrainerExtensionsTests.cs
diff --git a/src/Test/TransformInferenceTests.cs → ...L.AutoML.Tests/TransformInferenceTests.cs b/src/Test/TransformInferenceTests.cs → ...L.AutoML.Tests/TransformInferenceTests.cs
diff --git a/...est/TransformPostTrainerInferenceTests.cs → ...sts/TransformPostTrainerInferenceTests.cs b/...est/TransformPostTrainerInferenceTests.cs → ...sts/TransformPostTrainerInferenceTests.cs
diff --git a/src/Test/UserInputValidationTests.cs → ....AutoML.Tests/UserInputValidationTests.cs b/src/Test/UserInputValidationTests.cs → ....AutoML.Tests/UserInputValidationTests.cs
diff --git a/src/Test/Util.cs → test/Microsoft.ML.AutoML.Tests/Util.cs b/src/Test/Util.cs → test/Microsoft.ML.AutoML.Tests/Util.cs
diff --git a/src/Test/Utils/MLNetUtils/EmptyDataView.cs → ...L.Tests/Utils/MLNetUtils/EmptyDataView.cs b/src/Test/Utils/MLNetUtils/EmptyDataView.cs → ...L.Tests/Utils/MLNetUtils/EmptyDataView.cs
diff --git a/src/Test/Utils/MLNetUtils/MLNetUtils.cs → ...toML.Tests/Utils/MLNetUtils/MLNetUtils.cs b/src/Test/Utils/MLNetUtils/MLNetUtils.cs → ...toML.Tests/Utils/MLNetUtils/MLNetUtils.cs
diff --git a/src/Test/run-tests.proj → .../Microsoft.ML.AutoML.Tests/run-tests.proj b/src/Test/run-tests.proj → .../Microsoft.ML.AutoML.Tests/run-tests.proj
diff --git a/...ilderCSFileContentBinaryTest.approved.txt → ...ilderCSFileContentBinaryTest.approved.txt b/...ilderCSFileContentBinaryTest.approved.txt → ...ilderCSFileContentBinaryTest.approved.txt
diff --git a/...lBuilderCSFileContentOvaTest.approved.txt → ...lBuilderCSFileContentOvaTest.approved.txt b/...lBuilderCSFileContentOvaTest.approved.txt → ...lBuilderCSFileContentOvaTest.approved.txt
diff --git a/...rCSFileContentRegressionTest.approved.txt → ...rCSFileContentRegressionTest.approved.txt b/...rCSFileContentRegressionTest.approved.txt → ...rCSFileContentRegressionTest.approved.txt
diff --git a/...eAppProgramCSFileContentTest.approved.txt → ...eAppProgramCSFileContentTest.approved.txt b/...eAppProgramCSFileContentTest.approved.txt → ...eAppProgramCSFileContentTest.approved.txt
diff --git a/...oleAppProjectFileContentTest.approved.txt → ...oleAppProjectFileContentTest.approved.txt b/...oleAppProjectFileContentTest.approved.txt → ...oleAppProjectFileContentTest.approved.txt
diff --git a/....ModelProjectFileContentTest.approved.txt → ....ModelProjectFileContentTest.approved.txt b/....ModelProjectFileContentTest.approved.txt → ....ModelProjectFileContentTest.approved.txt
diff --git a/...ObservationCSFileContentTest.approved.txt → ...ObservationCSFileContentTest.approved.txt b/...ObservationCSFileContentTest.approved.txt → ...ObservationCSFileContentTest.approved.txt
diff --git a/....PredictionCSFileContentTest.approved.txt → ....PredictionCSFileContentTest.approved.txt b/....PredictionCSFileContentTest.approved.txt → ....PredictionCSFileContentTest.approved.txt
diff --git a/...pprovalTests/ConsoleCodeGeneratorTests.cs → ...pprovalTests/ConsoleCodeGeneratorTests.cs b/...pprovalTests/ConsoleCodeGeneratorTests.cs → ...pprovalTests/ConsoleCodeGeneratorTests.cs
@@ -12,7 +12,7 @@
 using Microsoft.ML.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace mlnet.Test
+namespace mlnet.Tests
 {
     [TestClass]
     [UseReporter(typeof(DiffReporter))]

diff --git a/src/mlnet.Test/CodeGenTests.cs → test/mlnet.Tests/CodeGenTests.cs b/src/mlnet.Test/CodeGenTests.cs → test/mlnet.Tests/CodeGenTests.cs
@@ -10,7 +10,7 @@
 using Microsoft.ML.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace mlnet.Test
+namespace mlnet.Tests
 {
     [TestClass]
     public class CodeGeneratorTests

diff --git a/src/mlnet.Test/CommandLineTests.cs → test/mlnet.Tests/CommandLineTests.cs b/src/mlnet.Test/CommandLineTests.cs → test/mlnet.Tests/CommandLineTests.cs
@@ -12,7 +12,7 @@
 using Microsoft.ML.CLI.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace mlnet.Test
+namespace mlnet.Tests
 {
     [TestClass]
     public class CommandLineTests

diff --git a/src/mlnet.Test/DatasetUtil.cs → test/mlnet.Tests/DatasetUtil.cs b/src/mlnet.Test/DatasetUtil.cs → test/mlnet.Tests/DatasetUtil.cs
@@ -8,7 +8,7 @@
 using Microsoft.ML;
 using Microsoft.ML.Auto;
 
-namespace mlnet.Test
+namespace mlnet.Tests
 {
     internal static class DatasetUtil
     {

diff --git a/src/mlnet.Test/Directory.Build.props → test/mlnet.Tests/Directory.Build.props b/src/mlnet.Test/Directory.Build.props → test/mlnet.Tests/Directory.Build.props
diff --git a/src/mlnet.Test/TrainerGeneratorTests.cs → test/mlnet.Tests/TrainerGeneratorTests.cs b/src/mlnet.Test/TrainerGeneratorTests.cs → test/mlnet.Tests/TrainerGeneratorTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.ML.CLI.CodeGenerator.CSharp;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace mlnet.Test
+namespace mlnet.Tests
 {
     /****************************
      * TODO : Add all trainer tests :

diff --git a/src/mlnet.Test/TransformGeneratorTests.cs → test/mlnet.Tests/TransformGeneratorTests.cs b/src/mlnet.Test/TransformGeneratorTests.cs → test/mlnet.Tests/TransformGeneratorTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.ML.CLI.CodeGenerator.CSharp;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace mlnet.Test
+namespace mlnet.Tests
 {
     [TestClass]
     public class TransformGeneratorTests

diff --git a/src/mlnet.Test/mlnet.Test.csproj → test/mlnet.Tests/mlnet.Tests.csproj b/src/mlnet.Test/mlnet.Test.csproj → test/mlnet.Tests/mlnet.Tests.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj" />
-    <ProjectReference Include="..\mlnet\mlnet.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj" />
+    <ProjectReference Include="..\..\src\mlnet\mlnet.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/mlnet.Test/run-tests.proj → test/mlnet.Tests/run-tests.proj b/src/mlnet.Test/run-tests.proj → test/mlnet.Tests/run-tests.proj