fix tests, re-add AutoML samples csproj

Dmitry-A · Dmitry-A · commit 179a99abd42d · 2019-08-19T12:32:00.000-07:00
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
@@ -274,6 +274,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.AutoML", "Micr
 		pkg\Microsoft.ML.AutoML\Microsoft.ML.AutoML.symbols.nupkgproj = pkg\Microsoft.ML.AutoML\Microsoft.ML.AutoML.symbols.nupkgproj
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutoML.Samples", "docs\samples\Microsoft.ML.AutoML.Samples\Microsoft.ML.AutoML.Samples.csproj", "{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1586,6 +1588,30 @@ Global
 		{E48285BF-F49A-4EA3-AED0-1BDDBF77EB80}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 		{E48285BF-F49A-4EA3-AED0-1BDDBF77EB80}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
 		{E48285BF-F49A-4EA3-AED0-1BDDBF77EB80}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netcoreapp3_0|Any CPU.ActiveCfg = Debug-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netcoreapp3_0|Any CPU.Build.0 = Debug-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netcoreapp3_0|x64.ActiveCfg = Debug-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netcoreapp3_0|x64.Build.0 = Debug-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release|x64.Build.0 = Release|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netcoreapp3_0|Any CPU.ActiveCfg = Release-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netcoreapp3_0|Any CPU.Build.0 = Release-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netcoreapp3_0|x64.ActiveCfg = Release-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netcoreapp3_0|x64.Build.0 = Release-netcoreapp3_0|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU	
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1671,6 +1697,7 @@ Global
 		{C2652287-CD6D-40FB-B042-95FB56D09DB8} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{E48285BF-F49A-4EA3-AED0-1BDDBF77EB80} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{F5D11F71-2D61-4AE9-99D7-0F0B54649B15} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
+		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3} = {DA452A53-2E94-4433-B08C-041EDEC729E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/test/Microsoft.ML.AutoML.Tests/UserInputValidationTests.cs b/test/Microsoft.ML.AutoML.Tests/UserInputValidationTests.cs
@@ -18,7 +18,7 @@ public class UserInputValidationTests
         public void ValidateExperimentExecuteNullTrainData()
         {
             var ex = Assert.Throws<ArgumentNullException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(null, new ColumnInformation(), null, TaskKind.Regression));
-            Assert.Equal("Training data cannot be null" + Environment.NewLine + "Parameter name: trainData", ex.Message);
+            Assert.StartsWith("Training data cannot be null", ex.Message);
         }
 
         [Fact]
@@ -84,7 +84,7 @@ public void ValidateExperimentExecuteArgsTrainValidColCountMismatch()
 
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainData, 
                 new ColumnInformation() { LabelColumnName = "0" }, validData, TaskKind.Regression));
-            Assert.Equal("Training data and validation data schemas do not match. Train data has '2' columns,and validation data has '1' columns." + Environment.NewLine + "Parameter name: validationData", ex.Message);
+            Assert.StartsWith("Training data and validation data schemas do not match. Train data has '2' columns,and validation data has '1' columns.", ex.Message);
         }
 
         [Fact]
@@ -104,7 +104,7 @@ public void ValidateExperimentExecuteArgsTrainValidColNamesMismatch()
 
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainData,
                 new ColumnInformation() { LabelColumnName = "0" }, validData, TaskKind.Regression));
-            Assert.Equal("Training data and validation data schemas do not match. Column '1' exsits in train data, but not in validation data." + Environment.NewLine + "Parameter name: validationData", ex.Message);
+            Assert.StartsWith("Training data and validation data schemas do not match. Column '1' exsits in train data, but not in validation data.", ex.Message);
         }
 
         [Fact]
@@ -124,21 +124,21 @@ public void ValidateExperimentExecuteArgsTrainValidColTypeMismatch()
 
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainData,
                 new ColumnInformation() { LabelColumnName = "0" }, validData, TaskKind.Regression));
-            Assert.Equal("Training data and validation data schemas do not match. Column '1' is of type String in train data, and type Single in validation data." + Environment.NewLine + "Parameter name: validationData", ex.Message);
+            Assert.StartsWith("Training data and validation data schemas do not match. Column '1' is of type String in train data, and type Single in validation data.", ex.Message);
         }
 
         [Fact]
         public void ValidateInferColumnsArgsNullPath()
         {
             var ex = Assert.Throws<ArgumentNullException>(() => UserInputValidationUtil.ValidateInferColumnsArgs(null, "Label"));
-            Assert.Equal("Provided path cannot be null" + Environment.NewLine + "Parameter name: path", ex.Message);
+            Assert.StartsWith("Provided path cannot be null", ex.Message);
         }
 
         [Fact]
         public void ValidateInferColumnsArgsPathNotExist()
         {
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateInferColumnsArgs("idontexist", "Label"));
-            Assert.Equal("File 'idontexist' does not exist" + Environment.NewLine + "Parameter name: path", ex.Message);
+            Assert.StartsWith("File 'idontexist' does not exist", ex.Message);
         }
 
         [Fact]
@@ -147,7 +147,7 @@ public void ValidateInferColumnsArgsEmptyFile()
             const string emptyFilePath = "empty";
             File.Create(emptyFilePath).Dispose();
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateInferColumnsArgs(emptyFilePath, "Label"));
-            Assert.Equal("File at path 'empty' cannot be empty" + Environment.NewLine + "Parameter name: path", ex.Message);
+            Assert.StartsWith("File at path 'empty' cannot be empty", ex.Message);
         }
 
         [Fact]
@@ -166,7 +166,7 @@ public void ValidateFeaturesColInvalidType()
             var dataView = DataViewTestFixture.BuildDummyDataView(schema);
 
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(dataView, new ColumnInformation(), null, TaskKind.Regression));
-            Assert.Equal("Features column must be of data type Single" + Environment.NewLine + "Parameter name: trainData", ex.Message);
+            Assert.StartsWith("Features column must be of data type Single", ex.Message);
         }
 
         [Fact]
@@ -236,7 +236,7 @@ public void ValidateProhibitedFeatureColumnType()
 
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(dataView, new ColumnInformation(),
                 null, TaskKind.Regression));
-            Assert.Equal("Only supported feature column types are Boolean, Single, and String. Please change the feature column UInt64 of type UInt64 to one of the supported types." + Environment.NewLine + "Parameter name: trainData", ex.Message);
+            Assert.StartsWith("Only supported feature column types are Boolean, Single, and String. Please change the feature column UInt64 of type UInt64 to one of the supported types.", ex.Message);
         }
 
         [Fact]
@@ -249,7 +249,7 @@ public void ValidateEmptyTrainingDataThrows()
             var dataView = DataViewTestFixture.BuildDummyDataView(schema, createDummyRow: false);
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(dataView, new ColumnInformation(),
                 null, TaskKind.Regression));
-            Assert.Equal("Training data has 0 rows" + Environment.NewLine + "Parameter name: trainData", ex.Message);
+            Assert.StartsWith("Training data has 0 rows", ex.Message);
         }
 
         [Fact]
@@ -270,7 +270,7 @@ public void ValidateEmptyValidationDataThrows()
 
             var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainingData, new ColumnInformation(),
                 validationData, TaskKind.Regression));
-            Assert.Equal("Validation data has 0 rows" + Environment.NewLine + "Parameter name: validationData", ex.Message);
+            Assert.StartsWith("Validation data has 0 rows", ex.Message);
         }
 
         private static void ValidateLabelTypeTestCore<LabelRawType>(TaskKind task, PrimitiveDataViewType labelType, bool labelTypeShouldBeValid)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class UserInputValidationTests`
`18`	`18`	`public void ValidateExperimentExecuteNullTrainData()`
`19`	`19`	`{`
`20`	`20`	`var ex = Assert.Throws<ArgumentNullException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(null, new ColumnInformation(), null, TaskKind.Regression));`
`21`		`- Assert.Equal("Training data cannot be null" + Environment.NewLine + "Parameter name: trainData", ex.Message);`
	`21`	`+ Assert.StartsWith("Training data cannot be null", ex.Message);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[Fact]`
`@@ -84,7 +84,7 @@ public void ValidateExperimentExecuteArgsTrainValidColCountMismatch()`
`84`	`84`
`85`	`85`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainData,`
`86`	`86`	`new ColumnInformation() { LabelColumnName = "0" }, validData, TaskKind.Regression));`
`87`		`- Assert.Equal("Training data and validation data schemas do not match. Train data has '2' columns,and validation data has '1' columns." + Environment.NewLine + "Parameter name: validationData", ex.Message);`
	`87`	`+ Assert.StartsWith("Training data and validation data schemas do not match. Train data has '2' columns,and validation data has '1' columns.", ex.Message);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`[Fact]`
`@@ -104,7 +104,7 @@ public void ValidateExperimentExecuteArgsTrainValidColNamesMismatch()`
`104`	`104`
`105`	`105`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainData,`
`106`	`106`	`new ColumnInformation() { LabelColumnName = "0" }, validData, TaskKind.Regression));`
`107`		`- Assert.Equal("Training data and validation data schemas do not match. Column '1' exsits in train data, but not in validation data." + Environment.NewLine + "Parameter name: validationData", ex.Message);`
	`107`	`+ Assert.StartsWith("Training data and validation data schemas do not match. Column '1' exsits in train data, but not in validation data.", ex.Message);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`[Fact]`
`@@ -124,21 +124,21 @@ public void ValidateExperimentExecuteArgsTrainValidColTypeMismatch()`
`124`	`124`
`125`	`125`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainData,`
`126`	`126`	`new ColumnInformation() { LabelColumnName = "0" }, validData, TaskKind.Regression));`
`127`		`- Assert.Equal("Training data and validation data schemas do not match. Column '1' is of type String in train data, and type Single in validation data." + Environment.NewLine + "Parameter name: validationData", ex.Message);`
	`127`	`+ Assert.StartsWith("Training data and validation data schemas do not match. Column '1' is of type String in train data, and type Single in validation data.", ex.Message);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`[Fact]`
`131`	`131`	`public void ValidateInferColumnsArgsNullPath()`
`132`	`132`	`{`
`133`	`133`	`var ex = Assert.Throws<ArgumentNullException>(() => UserInputValidationUtil.ValidateInferColumnsArgs(null, "Label"));`
`134`		`- Assert.Equal("Provided path cannot be null" + Environment.NewLine + "Parameter name: path", ex.Message);`
	`134`	`+ Assert.StartsWith("Provided path cannot be null", ex.Message);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`[Fact]`
`138`	`138`	`public void ValidateInferColumnsArgsPathNotExist()`
`139`	`139`	`{`
`140`	`140`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateInferColumnsArgs("idontexist", "Label"));`
`141`		`- Assert.Equal("File 'idontexist' does not exist" + Environment.NewLine + "Parameter name: path", ex.Message);`
	`141`	`+ Assert.StartsWith("File 'idontexist' does not exist", ex.Message);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`[Fact]`
`@@ -147,7 +147,7 @@ public void ValidateInferColumnsArgsEmptyFile()`
`147`	`147`	`const string emptyFilePath = "empty";`
`148`	`148`	`File.Create(emptyFilePath).Dispose();`
`149`	`149`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateInferColumnsArgs(emptyFilePath, "Label"));`
`150`		`- Assert.Equal("File at path 'empty' cannot be empty" + Environment.NewLine + "Parameter name: path", ex.Message);`
	`150`	`+ Assert.StartsWith("File at path 'empty' cannot be empty", ex.Message);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`[Fact]`
`@@ -166,7 +166,7 @@ public void ValidateFeaturesColInvalidType()`
`166`	`166`	`var dataView = DataViewTestFixture.BuildDummyDataView(schema);`
`167`	`167`
`168`	`168`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(dataView, new ColumnInformation(), null, TaskKind.Regression));`
`169`		`- Assert.Equal("Features column must be of data type Single" + Environment.NewLine + "Parameter name: trainData", ex.Message);`
	`169`	`+ Assert.StartsWith("Features column must be of data type Single", ex.Message);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`[Fact]`
`@@ -236,7 +236,7 @@ public void ValidateProhibitedFeatureColumnType()`
`236`	`236`
`237`	`237`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(dataView, new ColumnInformation(),`
`238`	`238`	`null, TaskKind.Regression));`
`239`		`- Assert.Equal("Only supported feature column types are Boolean, Single, and String. Please change the feature column UInt64 of type UInt64 to one of the supported types." + Environment.NewLine + "Parameter name: trainData", ex.Message);`
	`239`	`+ Assert.StartsWith("Only supported feature column types are Boolean, Single, and String. Please change the feature column UInt64 of type UInt64 to one of the supported types.", ex.Message);`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`[Fact]`
`@@ -249,7 +249,7 @@ public void ValidateEmptyTrainingDataThrows()`
`249`	`249`	`var dataView = DataViewTestFixture.BuildDummyDataView(schema, createDummyRow: false);`
`250`	`250`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(dataView, new ColumnInformation(),`
`251`	`251`	`null, TaskKind.Regression));`
`252`		`- Assert.Equal("Training data has 0 rows" + Environment.NewLine + "Parameter name: trainData", ex.Message);`
	`252`	`+ Assert.StartsWith("Training data has 0 rows", ex.Message);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`[Fact]`
`@@ -270,7 +270,7 @@ public void ValidateEmptyValidationDataThrows()`
`270`	`270`
`271`	`271`	`var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(trainingData, new ColumnInformation(),`
`272`	`272`	`validationData, TaskKind.Regression));`
`273`		`- Assert.Equal("Validation data has 0 rows" + Environment.NewLine + "Parameter name: validationData", ex.Message);`
	`273`	`+ Assert.StartsWith("Validation data has 0 rows", ex.Message);`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`private static void ValidateLabelTypeTestCore<LabelRawType>(TaskKind task, PrimitiveDataViewType labelType, bool labelTypeShouldBeValid)`