Put tests in the "tests" subdirectory

Bruce Eckel · Bruce Eckel · commit 543409a58e9e · 2016-09-01T15:14:44.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -159,20 +159,7 @@ subprojects {
     }
 
     junitPlatform {
-        // platformVersion '1.0.0-SNAPSHOT'
-        //engines {
-          //  include 'junit-jupiter', 'junit-vintage'
-            // exclude 'custom-engine'
-        //}
-/*        tags {
-            // include 'fast'
-            exclude 'slow'
-        }*/
-        //includeClassNamePattern '.*Test'
         includeClassNamePattern '.*'
-        // enableStandardTestTask true
-        // reportsDir "build/test-results/junit-platform" // this is the default
-        //logManager 'org.apache.logging.log4j.jul.LogManager'
     }
 
     // See: http://blog.jessitron.com/2012/07/using-checkstyle-in-gradle.html
@@ -187,8 +174,7 @@ subprojects {
         main {
             java {
                 srcDir projectDir
-                // Remove this when it's working:
-                // exclude "DynamicStringInverterTests.java"
+                exclude "tests/**"
             }
             resources {
                 srcDir projectDir
@@ -200,18 +186,13 @@ subprojects {
                 srcDir projectDir
             }
         }
-/*        test {
+        test {
             java {
-                srcDir projectDir
+                srcDir new File(projectDir, "tests")
             }
-        }*/
+        }
     }
 
-    /*test {
-        testClassesDir = sourceSets.main.output.classesDir
-        classpath  = sourceSets.main.runtimeClasspath
-    }*/
-
     jmh {
         jmhVersion = '1.13'
         duplicateClassesStrategy = 'warn'
@@ -227,13 +208,11 @@ subprojects {
 
             // Exclude java sources that will not compile
             if (tags.compileTimeError) {
-                // println ">>> Excluding " + file.name
                 sourceSets.main.java.excludes.add(file.name)
             } else {
                 JavaExec javaTask = null
                 // Add tasks for java sources with main methods
                 if (tags.hasMainMethod || tags.javaCmd) {
-
                     javaTask = tasks.create(name: tags.fileRoot, type: JavaExec, dependsOn: tags.runFirst) {
                         main = tags.mainClass
                         classpath = sourceSets.main.runtimeClasspath
diff --git a/references/tests/DeepCopyTest.java b/references/tests/DeepCopyTest.java
@@ -1,4 +1,4 @@
-// references/DeepCopyTest.java
+// references/tests/DeepCopyTest.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/tests/CountedListTest.java b/validating/tests/CountedListTest.java
@@ -1,4 +1,4 @@
-// validating/CountedListTest.java
+// validating/tests/CountedListTest.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/tests/DynamicStringInverterTests.java b/validating/tests/DynamicStringInverterTests.java
@@ -1,4 +1,4 @@
-// validating/DynamicStringInverterTests.java
+// validating/tests/DynamicStringInverterTests.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
diff --git a/validating/tests/QueueTest.java b/validating/tests/QueueTest.java
@@ -1,9 +1,8 @@
-// validating/QueueTest.java
+// validating/tests/QueueTest.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
 package validating;
-//import validating.Queue;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/validating/tests/StringInverterTests.java b/validating/tests/StringInverterTests.java
@@ -1,4 +1,4 @@
-// validating/StringInverterTests.java
+// validating/tests/StringInverterTests.java
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// references/DeepCopyTest.java`
	`1`	`+// references/tests/DeepCopyTest.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// validating/CountedListTest.java`
	`1`	`+// validating/tests/CountedListTest.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// validating/DynamicStringInverterTests.java`
	`1`	`+// validating/tests/DynamicStringInverterTests.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// validating/StringInverterTests.java`
	`1`	`+// validating/tests/StringInverterTests.java`
`2`	`2`	`// (c)2016 MindView LLC: see Copyright.txt`
`3`	`3`	`// We make no guarantees that this code is fit for any purpose.`
`4`	`4`	`// Visit http://mindviewinc.com/Books/OnJava/ for more book information.`