update canonical opencadc.gradle

cadc-quality/opencadc-1.1.gradle

@@ -47,37 +47,25 @@ tasks.withType(Checkstyle).each { checkstyleTask ->
     }
 }
 
-tasks.withType(Test) {
-    // reset the report destinations so that intTests go to their own page
-    //reports.html.destination = file("${reporting.baseDir}/${name}")
-    reports.html.destination = file(reporting.baseDir.getAbsolutePath() + '/' + name)
-
-    // Assign all Java system properties from
-    // the command line to the tests
+tasks.withType(Test).configureEach {
+    // separate report destinations for each test task
+    reports.html.outputLocation = layout.buildDirectory.dir("reports/tests/${name}")
+
+    // assign all Java system properties from the command line to the tests
     systemProperties System.properties
-}
-
-task intTest(type: Test) {
-    // set the configuration context
-    testClassesDirs = sourceSets.intTest.output.classesDirs
-    classpath = sourceSets.intTest.runtimeClasspath
 
-    // run the tests always
-    outputs.upToDateWhen { false }
-}
-
-test {
     testLogging {
         events "PASSED", "FAILED", "SKIPPED"
-        // "STARTED", 
     }
 }
 
-intTest {
-    testLogging {
-        events "PASSED", "FAILED", "SKIPPED"
-        // "STARTED",
-    }
+tasks.register('intTest', Test) {
+    // Set the configuration context
+    testClassesDirs = sourceSets.intTest.output.classesDirs
+    classpath = sourceSets.intTest.runtimeClasspath
+
+    // Run the tests always
+    outputs.upToDateWhen { false }
 }
 
 pluginManager.withPlugin('maven-publish') {
@@ -92,6 +80,6 @@ pluginManager.withPlugin('maven-publish') {
 }
 
 // backwards compat usage
-task install {
-    dependsOn 'publishToMavenLocal'
+tasks.register('install') {
+    dependsOn(tasks.named('publishToMavenLocal'))
 }

cadc-util/src/test/java/ca/nrc/cadc/auth/BearerTokenPrincipalTest.java

@@ -3,7 +3,7 @@
 *******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 **************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 *
-*  (c) 2019.                            (c) 2019.
+*  (c) 2026.                            (c) 2026.
 *  Government of Canada                 Gouvernement du Canada
 *  National Research Council            Conseil national de recherches
 *  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -70,10 +70,9 @@
 package ca.nrc.cadc.auth;
 
 import ca.nrc.cadc.util.Log4jInit;
-import junit.framework.Assert;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

cadc-util/src/test/java/ca/nrc/cadc/auth/OpenIdPrincipalTest.java

@@ -3,7 +3,7 @@
 *******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 **************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 *
-*  (c) 2019.                            (c) 2019.
+*  (c) 2026.                            (c) 2026.
 *  Government of Canada                 Gouvernement du Canada
 *  National Research Council            Conseil national de recherches
 *  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -74,8 +74,8 @@
 import java.net.URL;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.junit.Assert;
 import org.junit.Test;
-import junit.framework.Assert;
 
 /**
  *

cadc-util/src/intTest/java/ca/nrc/cadc/net/HttpDownloadTest.java → cadc-util/src/test/java/ca/nrc/cadc/net/HttpDownloadTest.java

@@ -105,8 +105,8 @@ public class HttpDownloadTest
     }
 
     public HttpDownloadTest() throws Exception {
-        this.okURL = new URL("https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/robots.txt");
-        this.resumableURL = new URL("https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/robots.txt");
+        this.okURL = new URL("https://raw.githubusercontent.com/opencadc/core/refs/heads/main/opencadc.gradle");
+        this.resumableURL = okURL;
         this.redirectURL = new URL("https://httpbin.org/redirect?url=" + okURL);
         this.permissionDeniedURL = new URL("https://httpbin.org/status/403");
         this.notFoundURL = new URL("https://httpbin.org/status/404");
@@ -180,7 +180,7 @@ public void testDownloadFileToDir() throws Exception
             Assert.assertNotNull("result file", out);
             Assert.assertTrue("dest file exists after download", out.exists());
             Assert.assertTrue("dest file size > 0", out.length() > 0);
-            Assert.assertEquals("filename", "robots.txt", out.getName());
+            Assert.assertEquals("filename", "opencadc.gradle", out.getName());
         }
         catch (Exception unexpected)
         {

cadc-util/src/intTest/java/ca/nrc/cadc/net/HttpGetTest.java → cadc-util/src/test/java/ca/nrc/cadc/net/HttpGetTest.java

@@ -104,7 +104,7 @@ public class HttpGetTest {
     }
 
     public HttpGetTest() throws Exception {
-        this.okURL = new URL("https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/robots.txt");
+        this.okURL = new URL("https://raw.githubusercontent.com/opencadc/core/refs/heads/main/opencadc.gradle");
         this.permissionDeniedURL = new URL("https://httpbin.org/status/403");
         this.notFoundURL = new URL("https://httpbin.org/status/404");
 

cadc-util/src/test/java/ca/nrc/cadc/util/ThrowableUtilTest.java

@@ -3,7 +3,7 @@
 *******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 **************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 *
-*  (c) 2016.                            (c) 2016.
+*  (c) 2026.                            (c) 2026.
 *  Government of Canada                 Gouvernement du Canada
 *  National Research Council            Conseil national de recherches
 *  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -70,9 +70,7 @@
 package ca.nrc.cadc.util;
 
 import java.io.FileNotFoundException;
-
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

opencadc.gradle

@@ -47,37 +47,25 @@ tasks.withType(Checkstyle).each { checkstyleTask ->
     }
 }
 
-tasks.withType(Test) {
-    // reset the report destinations so that intTests go to their own page
-    //reports.html.destination = file("${reporting.baseDir}/${name}")
-    reports.html.destination = file(reporting.baseDir.getAbsolutePath() + '/' + name)
-
-    // Assign all Java system properties from
-    // the command line to the tests
+tasks.withType(Test).configureEach {
+    // separate report destinations for each test task
+    reports.html.outputLocation = layout.buildDirectory.dir("reports/tests/${name}")
+
+    // assign all Java system properties from the command line to the tests
     systemProperties System.properties
-}
-
-task intTest(type: Test) {
-    // set the configuration context
-    testClassesDirs = sourceSets.intTest.output.classesDirs
-    classpath = sourceSets.intTest.runtimeClasspath
 
-    // run the tests always
-    outputs.upToDateWhen { false }
-}
-
-test {
     testLogging {
         events "PASSED", "FAILED", "SKIPPED"
-        // "STARTED", 
     }
 }
 
-intTest {
-    testLogging {
-        events "PASSED", "FAILED", "SKIPPED"
-        // "STARTED",
-    }
+tasks.register('intTest', Test) {
+    // Set the configuration context
+    testClassesDirs = sourceSets.intTest.output.classesDirs
+    classpath = sourceSets.intTest.runtimeClasspath
+
+    // Run the tests always
+    outputs.upToDateWhen { false }
 }
 
 pluginManager.withPlugin('maven-publish') {
@@ -92,6 +80,6 @@ pluginManager.withPlugin('maven-publish') {
 }
 
 // backwards compat usage
-task install {
-    dependsOn 'publishToMavenLocal'
+tasks.register('install') {
+    dependsOn(tasks.named('publishToMavenLocal'))
 }