Remove AppConfig.GetCodeRootPath.

nicholi · bgrainger · commit a4201907e18c · 2017-07-05T09:21:21.000-07:00
Get this necessary data from config  file (like everything else). Always move config.json to output dir.

Update the example config.json to show that the CertPath and/or TestDataPath must be specified as so.
diff --git a/.ci/config/config.buffer.json b/.ci/config/config.buffer.json
@@ -4,6 +4,8 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
       "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
     }
diff --git a/.ci/config/config.compression+ssl.json b/.ci/config/config.compression+ssl.json
@@ -4,7 +4,11 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
-      "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
+      "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
+
+      "CertificatesPath": "../../../../../.ci/server/certs"
     }
 }
diff --git a/.ci/config/config.compression.json b/.ci/config/config.compression.json
@@ -4,6 +4,8 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
       "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
     }
diff --git a/.ci/config/config.json b/.ci/config/config.json
@@ -4,6 +4,8 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
       "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
     }
diff --git a/.ci/config/config.ssl.json b/.ci/config/config.ssl.json
@@ -4,7 +4,11 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
-      "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
+      "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
+
+      "CertificatesPath": "../../../../../.ci/server/certs"
     }
 }
diff --git a/.ci/config/config.uds+ssl.json b/.ci/config/config.uds+ssl.json
@@ -4,7 +4,11 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
-      "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
+      "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
+
+      "CertificatesPath": "../../../../../.ci/server/certs"
     }
 }
diff --git a/.ci/config/config.uds.json b/.ci/config/config.uds.json
@@ -4,6 +4,8 @@
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
+
+      "TestData": "../../../../TestData",
       "MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
       "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
     }
diff --git a/.ci/run-tests.bat b/.ci/run-tests.bat
@@ -1,5 +1,5 @@
 @echo off
-echo Executing tests with No Compression, No SSL && copy /y tests\SideBySide\config.json.example tests\SideBySide\config.json && dotnet test tests/SideBySide --configuration Release
-echo Executing tests with Compression, No SSL && copy /y .ci\config\config.compression.json tests\SideBySide\config.json && dotnet test tests/SideBySide --configuration Release
-echo Executing tests with No Compression, SSL && copy /y .ci\config\config.ssl.json tests\SideBySide\config.json && dotnet test tests/SideBySide --configuration Release
-echo Executing tests with Compression, SSL && copy /y ".ci\config\config.compression+ssl.json" tests\SideBySide\config.json && dotnet test tests/SideBySide --configuration Release
+echo Executing tests with No Compression, No SSL && copy /y .ci\config\config.json tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
+echo Executing tests with Compression, No SSL && copy /y .ci\config\config.compression.json tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
+echo Executing tests with No Compression, SSL && copy /y .ci\config\config.ssl.json tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
+echo Executing tests with Compression, SSL && copy /y ".ci\config\config.compression+ssl.json" tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
diff --git a/tests/SideBySide/AppConfig.cs b/tests/SideBySide/AppConfig.cs
@@ -19,18 +19,14 @@ public static class AppConfig
 				["Data:SupportsJson"] = "false",
 			};
 
-		private static string CodeRootPath = GetCodeRootPath();
+		public static string CertsPath => Path.GetFullPath(Config.GetValue<string>("Data:CertificatesPath"));
 
-		public static string BasePath = Path.Combine(CodeRootPath, "tests", "SideBySide");
-
-		public static string CertsPath = Path.Combine(CodeRootPath, ".ci", "server", "certs");
-
-		public static string TestDataPath = Path.Combine(CodeRootPath, "tests", "TestData");
+		public static string TestDataPath => Path.GetFullPath(Config.GetValue<string>("Data:TestData"));
+		public static string RemoteTestDataPath => Path.GetFullPath(Config.GetValue<string>("Data:RemoteTestData"));
 
 		private static int _configFirst;
 
 		private static IConfiguration ConfigBuilder { get; } = new ConfigurationBuilder()
-			.SetBasePath(BasePath)
 			.AddInMemoryCollection(DefaultConfig)
 			.AddJsonFile("config.json")
 			.Build();
@@ -74,19 +70,6 @@ public static MySqlConnectionStringBuilder CreateSha256ConnectionStringBuilder()
 		// tests can run much slower in CI environments
 		public static int TimeoutDelayFactor { get; } = (Environment.GetEnvironmentVariable("APPVEYOR") == "True" || Environment.GetEnvironmentVariable("TRAVIS") == "true") ? 6 : 1;
 
-		private static string GetCodeRootPath()
-		{
-#if NET46
-			var currentAssembly = Assembly.GetExecutingAssembly();
-#else
-			var currentAssembly = typeof(AppConfig).GetTypeInfo().Assembly;
-#endif
-			var directory = new Uri(currentAssembly.CodeBase).LocalPath;
-			while (!string.Equals(Path.GetFileName(directory), "MySqlConnector", StringComparison.OrdinalIgnoreCase))
-				directory = Path.GetDirectoryName(directory);
-			return directory;
-		}
-
-		private static string ExpandVariables(string value) => value?.Replace("%TESTDATA%", TestDataPath);
+		private static string ExpandVariables(string value) => value?.Replace("%TESTDATA%", TestDataPath).Replace("%REMOTETESTDATA%", RemoteTestDataPath);
 	}
 }
diff --git a/tests/SideBySide/SideBySide.csproj b/tests/SideBySide/SideBySide.csproj
@@ -51,4 +51,10 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="config.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/tests/SideBySide/config.json.example b/tests/SideBySide/config.json.example
@@ -1,8 +1,13 @@
-{
+﻿{
     "Data": {
       "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;Use Affected Rows=true",
       "PasswordlessUser": "no_password",
       "SupportsCachedProcedures": true,
-      "SupportsJson": true
+      "SupportsJson": true,
+
+      "CertificatesPath": "C:/work/MySqlConnector/.ci/server/certs",
+
+      "TestData": "C:/work/MySqlConnector/tests/TestData",
+      "RemoteTestData": "/var/lib/mysql-files"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`"PasswordlessUser": "no_password",`
`5`	`5`	`"SecondaryDatabase": "testdb2",`
`6`	`6`	`"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",`
	`7`	`+`
	`8`	`+ "TestData": "../../../../TestData",`
`7`	`9`	`"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",`
`8`	`10`	`"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,11 @@`
`4`	`4`	`"PasswordlessUser": "no_password",`
`5`	`5`	`"SecondaryDatabase": "testdb2",`
`6`	`6`	`"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",`
	`7`	`+`
	`8`	`+ "TestData": "../../../../TestData",`
`7`	`9`	`"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",`
`8`		`- "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"`
	`10`	`+ "MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",`
	`11`	`+`
	`12`	`+ "CertificatesPath": "../../../../../.ci/server/certs"`
`9`	`13`	`}`
`10`	`14`	`}`