Try to split out tests and test dependencies into separate projects

Author: schveiguy

dub.sdl

@@ -1,65 +1,12 @@
 name        "mysql-native"
 description "A native MySQL driver implementation based on Steve Teale's original"
 license     "BSL-1.0"
-copyright   "Copyright (c) 2011-2019 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
-authors     "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky"
+copyright   "Copyright (c) 2011-2021 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, Nick Sabalausky, and Steven Schveighoffer"
+authors     "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky" "Steven Schveighoffer"
 
 dependency "vibe-core" version="~>1.16.0" optional=true
 
 toolchainRequirements frontend=">=2.068"
 
-sourcePaths "source/"
-importPaths "source/"
-
-configuration "application" {
-	targetType "executable"
-	versions "VibeCustomMain"
-}
-
-configuration "library" {
-	targetType "library"
-	excludedSourceFiles "source/app.d"
-}
-
-// Do not use this. Use "run_tests" insetad.
-configuration "unittest" {
-	excludedSourceFiles "source/app.d"
-	preBuildCommands \
-		"echo \"ERROR: Don't use 'dub test' to test mysql-native. Use 'run_tests' instead.\"" \
-		"echo Bailing..." \
-		"mkdir" // Generate error to halt build
-}
-
-// Run with: dub test -c unittest-vibe
-configuration "unittest-vibe" {
-	targetType "executable"
-	targetPath "bin/"
-	targetName "mysqln-tests-vibe"
-	excludedSourceFiles "source/app.d"
-
-	dependency "vibe-core" version="~>1.16.0" optional=false
-
-	// mainSourceFile "source/mysql/package.d"
-	debugVersions "MYSQLN_TESTS"
-}
-
-// Run with: dub run -c unittest-vibe-ut -- -t
-configuration "unittest-vibe-ut" {
-	targetType "executable"
-	targetPath "bin/"
-	targetName "mysqln-tests-vibe"
-	excludedSourceFiles "source/app.d"
-	sourceFiles "bin/ut.d"
-	importPaths "bin/"
-	buildOptions "unittests"
-
-	dependency "vibe-core" version="~>1.16.0" optional=false
-	
-	dependency "unit-threaded" version="~>1.0.15"
-
-	debugVersions "MYSQLN_TESTS"
-	versions "MYSQLN_TESTS_NO_MAIN"
-	versions "unitUnthreaded"
-
-	preBuildCommands "dub run unit-threaded -c gen_ut_main -- -f bin/ut.d"
-}
+subPackage "./integration-tests"
+subPackage "./testconn"

integration-tests/dub.sdl

@@ -0,0 +1,21 @@
+name        "integration-tests"
+description "Test harness for integration tests"
+license     "BSL-1.0"
+copyright   "Copyright (c) 2011-2021 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
+authors     "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky" "Steven Schveighoffer"
+
+dependency "mysql-native" path="../"
+dependency "unit-threaded" version="~>0.7.45"
+dependency "vibe-core" version="~>1.0"
+
+configuration "unittest" {
+    targetType "executable"
+    debugVersions "MYSQLN_TESTS"
+    versions "MYSQLN_TESTS_NO_MAIN"
+    versions "unitUnthreaded"
+    sourceFiles "bin/ut.d"
+    importPaths "bin/"
+    buildOptions "unittests"
+
+    preBuildCommands "dub run unit-threaded -c gen_ut_main -- -f bin/ut.d"
+}

integration-tests/source/app.d

@@ -0,0 +1,3 @@
+import mysql.test.common;
+import mysql.test.integration;
+import mysql.test.regression;

source/mysql/test/common.d renamed to integration-tests/source/mysql/test/common.d

@@ -42,12 +42,18 @@ version(DoCoreTests)
 	private @property string testConnectionStrFile()
 	{
 		import std.file, std.path;
+
+                return "testConnectionStr.txt";
 
-		static string cached;
+		/*static string cached;
 		if(!cached)
+                {
+                    import std.stdio;
 			cached = buildPath(thisExePath.dirName.dirName, "testConnectionStr.txt");
+                    writeln("the file is ", cached);
+                }
 
-		return cached;
+		return cached;*/
 	}
 
 	@property string testConnectionStr()
@@ -84,6 +90,8 @@ version(DoCoreTests)
 
 	Connection createCn(string cnStr = testConnectionStr)
 	{
+            import std.stdio;
+            writeln("testing with connection string ", testConnectionStr);
 		return new Connection(cnStr);
 	}
 

source/mysql/test/integration.d renamed to integration-tests/source/mysql/test/integration.d

@@ -0,0 +1,7 @@
+name        "test"
+description "Test harness for integration tests"
+license     "BSL-1.0"
+copyright   "Copyright (c) 2011-2021 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
+authors     "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky" "Steven Schveighoffer"
+
+dependency "mysql-native" version="*"