From f953d5c6e279e9400e351b63d055a394581d9391 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Mon, 1 Apr 2024 15:57:05 -0600 Subject: [PATCH 1/6] Add asserts to test --- .../src/test/java/ucar/nc2/dods/TestSequence.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/opendap/src/test/java/ucar/nc2/dods/TestSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestSequence.java index 223ad86905..4e09496eeb 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestSequence.java @@ -1,5 +1,8 @@ package ucar.nc2.dods; +import static com.google.common.truth.Truth.assertThat; + +import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,20 +24,20 @@ public void testSequence() { String url = "https://remotetest.unidata.ucar.edu/dts/whoi"; try { NetcdfDataset ds = NetcdfDatasets.openDataset(url); + assertThat(ds).isNotNull(); System.out.println(ds); Structure struct = (Structure) ds.findVariable("emolt_sensor"); Variable var = struct.findVariable("TEMP"); + assertThat((Object) var).isNotNull(); Array arr = var.read(); int n = (int) arr.getSize(); int i; - for (i = 0; arr.hasNext() && i < n; i++) - System.out.println(arr.nextDouble()); - if (i != n) { - System.err.println("short sequence"); - System.exit(1); + for (i = 0; arr.hasNext() && i < n; i++) { + assertThat(arr.nextDouble()).isNotNull(); } + assertThat(i).isEqualTo(n); } catch (Exception e) { - e.printStackTrace(); + Assert.fail("Exception thrown in testSequence: " + e.getMessage()); } } } From fb2f11bb5fd7e20bd332868067903c21f572d4e1 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Mon, 1 Apr 2024 16:01:32 -0600 Subject: [PATCH 2/6] Remove commented out/ unused test code --- .../java/ucar/nc2/dods/TestConvertD2N.java | 82 ------------------- 1 file changed, 82 deletions(-) diff --git a/opendap/src/test/java/ucar/nc2/dods/TestConvertD2N.java b/opendap/src/test/java/ucar/nc2/dods/TestConvertD2N.java index 2ee4fe1f9c..97deda25b9 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestConvertD2N.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestConvertD2N.java @@ -5,7 +5,6 @@ package ucar.nc2.dods; import opendap.dap.*; -import opendap.dap.parsers.ParseException; import opendap.test.TestSources; import org.junit.Test; import org.slf4j.Logger; @@ -41,15 +40,12 @@ static DataDDS testDataDDSfromServer(String urlName, String CE) // get the DDS DDS dds = dodsConnection.getDDS(); dds.print(System.out); - // DodsV root = DodsV.parseDDS( dds); // get the DAS DAS das = dodsConnection.getDAS(); das.print(System.out); System.out.println(); - // root.parseDAS(das); - // get the DataDDS System.out.println("--DConnect.getData CE= " + CE); DataDDS dataDDS = dodsConnection.getData("?" + CE, null); @@ -81,43 +77,6 @@ static DataDDS testDataDDSfromServer(String urlName, String CE) return dataDDS; } - static void testArray(String urlName) throws IOException, opendap.dap.DAP2Exception { - - System.out.println("checkArray =" + urlName); - DConnect2 dodsConnection = new DConnect2(urlName, true); - - // get the DataDDS - DataDDS dataDDS = dodsConnection.getData("?", null); - dataDDS.print(System.out); - System.out.println(); - DodsV root = DodsV.parseDataDDS(dataDDS); - - ConvertD2N converter = new ConvertD2N(); - DODSNetcdfFile dodsfile = new DODSNetcdfFile(urlName); - List vars = dodsfile.getVariables(); - for (int i = 0; i < vars.size(); i++) { - Variable v = (Variable) vars.get(i); - String name = DODSNetcdfFile.getDODSConstraintName(v); - DodsV dodsV = root.findByDodsShortName(name); - if (dodsV == null) { - System.out.println("Cant find " + name); - continue; - } - Array data = converter.convertTopVariable(v, null, dodsV); - showArray(v.getFullName(), data, System.out, ""); - } - - /* - * for (int i = 0; i < root.children.size(); i++) { - * DodsV dodsV = (DodsV) root.children.get(i); - * Variable v = dodsfile.findVariable( dodsV.getNetcdfShortName()); - * Array data = converter.convertTopVariable(v, null, dodsV); - * showArray( data, System.out, ""); - * } - */ - System.out.println("============"); - } - static void showDDS(DataDDS dds, PrintWriter out) { out.println("DDS=" + dds.getEncodedName()); Enumeration e = dds.getVariables(); @@ -272,49 +231,8 @@ static void showShape(int[] shape, PrintStream out) { out.print(")"); } - static private void test(String url) throws IOException, ParseException, DAP2Exception, InvalidRangeException { - testDataDDSfromServer(url, ""); - testArray(url); - } - @Test public void testStuff() throws IOException, DAP2Exception, InvalidRangeException { - - /* - * test(server+"test.01"); // scalars - * test(server+"test.02"); // 1D arrays - * test(server+"test.03"); // 3D arrays - * - * test(server+"test.04"); // Structure with scalars - * test(server+"test.05"); // nested Structures with scalars - * test(server+"test.07a"); // Structure - * test(server+"test.21"); // Structure with multidim fields - * test(server+"test.50"); // array of structures - * - * test(server+"test.53"); // array of structures with nested scalar structure - * - * test(server+"test.06"); // Grids - * test(server+"test.06a"); // Grids - * - * - * test(server+"b31"); // top Sequence - * test(server+"test.07"); // top Sequence - * test(server+"test.56"); // top Sequence with multidim field - * test(server+"test.31"); // top Sequence with nested Structure, Grid // - */ - - // test(server+"NestedSeq"); // nested Seq - // test(server+"NestedSeq2"); // nested Seq */ - testDataDDSfromServer(TestSources.XURL1 + "/NestedSeq2", "person1.age,person1.stuff&person1.age=3"); // nested Seq - // testDataDDSfromServer("http://dapper.pmel.noaa.gov/dapper/epic/woce_sl_time_monthly.cdp","location.profile&location._id=3"); - // // nested Seq - - // testDataDDSfromServer("http://dapper.pmel.noaa.gov/dapper/argo/argo_all.cdp", ""); // Sequence - - // testDataDDSfromServer(server+"test.22", ""); // Structure with nested Structure, Grid - // testDataDDSfromServer(server+"test.23", ""); // Structure with nested Sequence, Grid - // testDataDDSfromServer(server+"test.31", ""); // Sequence with nested Structure, Grid - // testDataDDSfromServer(server+"NestedSeq2", ""); } } From 73cae7bd1cdcb72e14bf2c34ca35c07e1103491b Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Mon, 1 Apr 2024 16:09:53 -0600 Subject: [PATCH 3/6] Use junit test and ignore annotations --- opendap/src/test/java/ucar/nc2/dods/TestDODSGrids.java | 3 ++- .../ucar/nc2/dods/TestDODSMultiArrayPrimitiveTypes.java | 2 +- opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java | 3 ++- opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java | 3 ++- .../test/java/ucar/nc2/dods/TestDODSStructureScalars.java | 2 +- .../ucar/nc2/dods/TestDODSStructureScalarsNested.java | 2 +- .../test/java/ucar/nc2/dods/TestDODSnestedSequence.java | 8 +++++++- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSGrids.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSGrids.java index d3124f1ae8..fa5b247274 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSGrids.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSGrids.java @@ -4,6 +4,7 @@ */ package ucar.nc2.dods; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.ma2.Array; @@ -19,7 +20,7 @@ public class TestDODSGrids { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @org.junit.Test + @Test public void testGrid() throws IOException { DODSNetcdfFile dodsfile = TestDODSRead.open("test.06"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSMultiArrayPrimitiveTypes.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSMultiArrayPrimitiveTypes.java index 709e4d6547..421db1517a 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSMultiArrayPrimitiveTypes.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSMultiArrayPrimitiveTypes.java @@ -17,7 +17,7 @@ public class TestDODSMultiArrayPrimitiveTypes { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @org.junit.Test + @Test public void testArrays() throws IOException { DODSNetcdfFile dodsfile = TestDODSRead.open("test.03"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java index 6b4aa3a263..c79005047e 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java @@ -5,6 +5,7 @@ package ucar.nc2.dods; import opendap.test.TestSources; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; @@ -34,7 +35,7 @@ static DODSNetcdfFile openAbs(String filename) throws IOException { return dodsfile; } - @org.junit.Test + @Test public void testRead() throws IOException { // simple open("test.01"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java index 8e58a4df66..55368b0206 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java @@ -4,6 +4,7 @@ */ package ucar.nc2.dods; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.ma2.Array; @@ -64,7 +65,7 @@ public class TestDODSSequence { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @org.junit.Test + @Test public void testReadSequence() throws IOException { DODSNetcdfFile dodsfile = TestDODSRead.open("test.07"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalars.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalars.java index 95532ecea5..438ed075ea 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalars.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalars.java @@ -33,7 +33,7 @@ public class TestDODSStructureScalars { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @org.junit.Test + @Test public void testStructureRead() throws IOException { DODSNetcdfFile dodsfile = TestDODSRead.open("test.04"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java index da9ab58b93..94b900aa73 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java @@ -41,7 +41,7 @@ public class TestDODSStructureScalarsNested { private DODSNetcdfFile dodsfile; - @org.junit.Test + @Test public void testScalarRead() throws IOException { dodsfile = TestDODSRead.open("test.05"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java index 07a68f5106..23a4f864ee 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java @@ -4,6 +4,8 @@ */ package ucar.nc2.dods; +import org.junit.Ignore; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.ma2.*; @@ -64,7 +66,7 @@ public class TestDODSnestedSequence { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - @org.junit.Test + @Test public void testNestedSequenceParent() throws IOException { DODSNetcdfFile dodsfile = TestDODSRead.open("NestedSeq"); @@ -101,6 +103,8 @@ public void testNestedSequenceParent() throws IOException { } + @Ignore + @Test public void utestNestedSequence() throws IOException, InvalidRangeException { DODSNetcdfFile dodsfile = TestDODSRead.open("NestedSeq"); @@ -153,6 +157,8 @@ public void utestNestedSequence() throws IOException, InvalidRangeException { } + @Ignore + @Test public void utestCE() throws IOException, InvalidRangeException { DODSNetcdfFile dodsFile = TestDODSRead.open("NestedSeq2"); Variable outerSequence = dodsFile.findVariable("person1"); From 177d9b627a73dd23969e03f836a7c0395f1035f8 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Mon, 1 Apr 2024 16:25:45 -0600 Subject: [PATCH 4/6] Remove unused or commented out test code --- dap4/src/test/java/dap4/test/Dap4Server.java | 35 --- .../test/java/dap4/test/DapTestCommon.java | 136 ---------- dap4/src/test/java/dap4/test/Dump.java | 233 ------------------ .../test/java/dap4/test/TestConstraints.java | 15 -- dap4/src/test/java/dap4/test/TestDap4Url.java | 12 - dap4/src/test/java/dap4/test/TestHyrax.java | 6 - .../src/test/java/dap4/test/TestParserCE.java | 8 - dap4/src/test/java/dap4/test/TestRaw.java | 14 -- dap4/src/test/java/dap4/test/TestRemote.java | 13 - .../java/ucar/httpservices/TestThreading.java | 4 - .../ucar/nc2/util/net/TestHTTPMethod.java | 14 -- .../ucar/nc2/util/net/TestHTTPSession.java | 1 - .../java/ucar/nc2/util/net/TestState.java | 7 - .../java/ucar/nc2/util/net/TestURIParse.java | 43 ---- .../src/test/java/opendap/test/TestClone.java | 7 - .../test/java/opendap/test/TestDConnect2.java | 2 - .../test/java/opendap/test/TestEncode.java | 1 - .../src/test/java/opendap/test/TestFiles.java | 23 -- .../test/java/opendap/test/TestGroups.java | 42 ---- .../src/test/java/opendap/test/TestMisc.java | 5 - .../nc2/dods/TestDODSArrayPrimitiveTypes.java | 2 - .../test/java/ucar/nc2/dods/TestDODSRead.java | 3 - .../java/ucar/nc2/dods/TestDODSSequence.java | 1 - .../ucar/nc2/dods/TestDODSStructureArray.java | 4 - .../dods/TestDODSStructureForSequence.java | 74 ------ .../dods/TestDODSStructureScalarsNested.java | 42 ---- .../java/ucar/nc2/dods/TestDODSSubset.java | 105 -------- .../ucar/nc2/dods/TestDODSnestedSequence.java | 65 ----- 28 files changed, 917 deletions(-) delete mode 100644 dap4/src/test/java/dap4/test/Dump.java diff --git a/dap4/src/test/java/dap4/test/Dap4Server.java b/dap4/src/test/java/dap4/test/Dap4Server.java index 58e82e0170..fe3cbb7dfe 100644 --- a/dap4/src/test/java/dap4/test/Dap4Server.java +++ b/dap4/src/test/java/dap4/test/Dap4Server.java @@ -6,9 +6,6 @@ package dap4.test; import dap4.core.util.DapConstants; -import dap4.core.util.DapException; -import ucar.httpservices.HTTPFactory; -import ucar.httpservices.HTTPMethod; import java.util.ArrayList; import java.util.List; @@ -40,14 +37,6 @@ static void register(boolean front, Dap4Server svc) { registry.add(svc); } - static Dap4Server getServer(String id) { - for (Dap4Server ds : registry) { - if (ds.id.equals(id)) - return ds; - } - return null; - } - ////////////////////////////////////////////////// // Instance variables public String id; @@ -81,30 +70,6 @@ public String getURL(String scheme) { buf.append(this.servletpath); return buf.toString(); } - - public boolean ping() { - boolean ok = false; - String url = getURL(); - try { - try (HTTPMethod method = HTTPFactory.Get(url)) { - int code = method.execute(); - if (code == 200) - ok = true; - } - } catch (Exception e) { - ok = false; - } - return ok; - } - - public static Dap4Server findServer() throws DapException { - // Find the server to use - for (Dap4Server svc : registry) { - if (svc.ping()) - return svc; - } - return null; - } } diff --git a/dap4/src/test/java/dap4/test/DapTestCommon.java b/dap4/src/test/java/dap4/test/DapTestCommon.java index 40a571602c..a98c55e941 100644 --- a/dap4/src/test/java/dap4/test/DapTestCommon.java +++ b/dap4/src/test/java/dap4/test/DapTestCommon.java @@ -5,9 +5,6 @@ package dap4.test; -import dap4.core.util.DapConstants; -import dap4.core.util.DapException; -import dap4.core.util.DapUtil; import dap4.dap4lib.HttpDSP; import ucar.nc2.dataset.NetcdfDataset; import ucar.nc2.write.Ncdump; @@ -15,7 +12,6 @@ import ucar.unidata.util.test.UnitTestCommon; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; @@ -30,64 +26,13 @@ abstract public class DapTestCommon extends UnitTestCommon { static final String DEFAULTTREEROOT = "dap4"; - public static final String FILESERVER = "file://localhost:8080"; - - public static final String ORDERTAG = "ucar.littleendian"; - public static final String TRANSLATETAG = "ucar.translate"; - public static final String TESTTAG = "ucar.testing"; - static final String D4TESTDIRNAME = ""; // Equivalent to the path to the webapp/d4ts for testing purposes protected static final String DFALTRESOURCEPATH = "/src/test/data/resources"; - protected static final String[] LEGALEXTENSIONS = {".dap", ".dmr", ".nc", "dmp", ".ncdump", ".dds", ".das", ".dods"}; - ////////////////////////////////////////////////// - static class TestFilter implements FileFilter { - boolean debug; - boolean strip; - String[] extensions; - - public TestFilter(boolean debug, String[] extensions) { - this.debug = debug; - this.strip = strip; - this.extensions = extensions; - } - - public boolean accept(File file) { - boolean ok = false; - if (file.isFile() && file.canRead()) { - // Check for proper extension - String name = file.getName(); - if (name != null) { - for (String ext : extensions) { - if (name.endsWith(ext)) - ok = true; - } - } - if (!ok && debug) - System.err.println("Ignoring: " + file.toString()); - } - return ok; - } - - static void filterfiles(String path, List matches, String... extensions) { - File testdirf = new File(path); - assert (testdirf.canRead()); - TestFilter tf = new TestFilter(DEBUG, extensions); - File[] filelist = testdirf.listFiles(tf); - for (int i = 0; i < filelist.length; i++) { - File file = filelist[i]; - if (file.isDirectory()) - continue; - String fname = DapUtil.canonicalpath(file.getAbsolutePath()); - matches.add(fname); - } - } - } - // Test properties static class TestProperties { boolean prop_diff; // Do comparison with baseline files @@ -138,10 +83,6 @@ public TestCaseCommon(String name) { ////////////////////////////////////////////////// // Static methods - protected static String getD4TestsRoot() { - return dap4testroot; - } - protected static String getResourceRoot() { return dap4resourcedir; } @@ -221,40 +162,13 @@ public void visual(String header, String captured) { System.err.flush(); } - protected void findServer(String path) throws DapException { - String svc = DapConstants.HTTPSCHEME + "//" + this.d4tsserver + "/d4ts"; - if (!checkServer(svc)) - System.err.println("D4TS Server not reachable: " + svc); - // Since we will be accessing it thru NetcdfDataset, we need to change the schema. - d4tsserver = "dap4://" + d4tsserver + "/d4ts"; - } - ////////////////////////////////////////////////// - public String getDAP4Root() { - return this.dap4root; - } - @Override public String getResourceDir() { return this.dap4resourcedir; } - static void printDir(String path) { - File testdirf = new File(path); - assert (testdirf.canRead()); - File[] filelist = testdirf.listFiles(); - System.err.println("\n*******************"); - System.err.printf("Contents of %s:%n", path); - for (int i = 0; i < filelist.length; i++) { - File file = filelist[i]; - String fname = file.getName(); - System.err.printf("\t%s%s%n", fname, (file.isDirectory() ? "/" : "")); - } - System.err.println("*******************"); - System.err.flush(); - } - ////////////////////////////////////////////////// // Filename processing utilities @@ -330,56 +244,6 @@ public static boolean regexpFilterLine(StringBuilder document, String regexp, bo return changed; } - - /** - * Choose a test case based on its name and return its index - * - * @param name to search for - * @param testcases set of testcases to search - */ - static void singleTest(String name, List testcases) { - for (int i = 0; i < testcases.size(); i++) { - TestCaseCommon tc = testcases.get(i); - if (tc.name.equalsIgnoreCase(name)) { - testcases.clear(); - testcases.add(tc); - } - } - return; - } - - /** - * Choose a test case based on its name and return its index - * - * @param index to search for - * @param testcases set of testcases to search - */ - static void singleTest(int index, List testcases) { - TestCaseCommon tc = testcases.get(index); - testcases.clear(); - testcases.add(tc); - return; - } - - protected String dumpmetadata(NetcdfDataset ncfile, String datasetname) throws Exception { - StringWriter sw = new StringWriter(); - StringBuilder args = new StringBuilder("-strict"); - if (datasetname != null) { - args.append(" -datasetname "); - args.append(datasetname); - } - // Print the meta-databuffer using these args to NcdumpW - try { - Ncdump.ncdump(ncfile, args.toString(), sw, null); - // if (!ucar.nc2.NCdumpW.print(ncfile, args.toString(), sw, null)) - // throw new Exception("NcdumpW failed"); - } catch (IOException ioe) { - throw new Exception("Ncdump failed", ioe); - } - sw.close(); - return sw.toString(); - } - protected String dumpdata(NetcdfDataset ncfile, String datasetname) throws Exception { StringBuilder args = new StringBuilder("-strict -vall"); if (datasetname != null) { diff --git a/dap4/src/test/java/dap4/test/Dump.java b/dap4/src/test/java/dap4/test/Dump.java deleted file mode 100644 index 548e906a74..0000000000 --- a/dap4/src/test/java/dap4/test/Dump.java +++ /dev/null @@ -1,233 +0,0 @@ -/* - * Copyright 2012, UCAR/Unidata. - * See the LICENSE file for more information. - */ - - -package dap4.test; - -import dap4.core.util.DapConstants; -import dap4.core.util.DapUtil; -import dap4.core.util.Escape; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.nio.BufferUnderflowException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - -public class Dump { - - ////////////////////////////////////////////////// - // Constants - - public static boolean DUMPCSUM = false; - - static final String LBRACE = "{"; - static final String RBRACE = "}"; - - static final BigInteger MASK = new BigInteger("FFFFFFFFFFFFFFFF", 16); - - ////////////////////////////////////////////////// - // Type decls - - // Place to insert the command list - public static interface Commands { - public void run(Dump printer) throws IOException; - } - - ////////////////////////////////////////////////// - // Instance databuffer - - protected ByteBuffer reader = null; - protected boolean checksumming = true; - protected ByteOrder remoteorder = null; - protected StringBuilder buf = null; - protected java.util.zip.Checksum localchecksum; - protected int lastchecksum = 0; - - ////////////////////////////////////////////////// - // Constructor(s) - - public Dump() {} - - ////////////////////////////////////////////////// - // Command processing - - public String dumpdata(InputStream stream, boolean checksumming, ByteOrder remoteorder, Commands commands) - throws IOException { - // Hack for debugging; use a bytebuffer internally - this.reader = ByteBuffer.wrap(DapUtil.readbinaryfile(stream)); - this.checksumming = checksumming; - this.remoteorder = remoteorder; - this.buf = new StringBuilder(); - commands.run(this); - return this.buf.toString(); - } - - public int printcount() throws IOException { - ByteBuffer bytes = checksum(8); - long l = bytes.getLong(); - buf.append(String.format("count=%d%n", l)); - return (int) l; - } - - public void printvalue(char cmd, int typesize, int... indices) throws IOException { - long l = 0; - ByteBuffer bytes = null; - // for strings and opaque, the typesize is zero - if (typesize == 0) { - bytes = checksum(8); - l = bytes.getLong(); - bytes = checksum((int) l); - } else - bytes = checksum(typesize); - if (indices != null && indices.length > 0) { - for (int index : indices) { - buf.append(" [" + Integer.toString(index) + "]"); - } - } - buf.append(" "); - int switcher = (((int) cmd) << 4) + typesize; - switch (switcher) { - case ('S' << 4) + 1: - byte b = bytes.get(); - l = ((long) b); - buf.append(String.format("%d", l)); - break; - case ('U' << 4) + 1: - b = bytes.get(); - l = ((long) b) & 0xFF; - buf.append(String.format("%d", l)); - break; - case ('C' << 4) + 0: - case ('C' << 4) + 1: - l = ((long) bytes.get()) & 0x7F; - buf.append(String.format("'%c'", (char) (l & 0xFF))); - break; - case ('S' << 4) + 2: - short s = bytes.getShort(); - l = ((long) s); - buf.append(String.format("%d", l)); - break; - case ('U' << 4) + 2: - s = bytes.getShort(); - l = ((long) s) & 0xFFFFL; - buf.append(String.format("%d", l)); - break; - case ('S' << 4) + 4: - int i = bytes.getInt(); - l = ((long) i); - buf.append(String.format("%d", l)); - break; - case ('U' << 4) + 4: - i = bytes.getInt(); - l = ((long) i) & 0xFFFFFFFFL; - buf.append(String.format("%d", l)); - break; - case ('S' << 4) + 8: - l = bytes.getLong(); - l = ((long) l); - buf.append(String.format("%d", l)); - break; - case ('U' << 4) + 8: // We have to convert to BigInteger to get this right - l = bytes.getLong(); - l = ((long) l); - BigInteger big = BigInteger.valueOf(l); - big = big.and(MASK); - buf.append(String.format("%s", big.toString())); - break; - case ('F' << 4) + 4: - Float f = bytes.getFloat(); - buf.append(String.format("%g", f)); - break; - case ('F' << 4) + 8: - Double d = bytes.getDouble(); - buf.append(String.format("%g", d)); - break; - case ('T' << 4) + 0: - // Read the text - buf.append('"' + Escape.backslashEscape(new String(bytes.array(), DapUtil.UTF8), "\"") + '"'); - break; - case ('O' << 4) + 0: - buf.append("0x"); - for (i = 0; i < bytes.limit(); i++) { - int uint8 = bytes.get(); - char c = hexchar((uint8 >> 4) & 0xF); - buf.append(c); - c = hexchar((uint8) & 0xF); - buf.append(c); - } - break; - default: - assert false; - } - } - - public void verifychecksum() throws IOException { - if (!checksumming) - return; - int localcrc32 = endchecksum(); - // Get the checksum from the input stream - ByteBuffer bbuf = readn(DapConstants.CHECKSUMSIZE); - int remotecrc32 = bbuf.getInt(); - assert localcrc32 == remotecrc32; - newline(); - } - - public void newline() { - buf.append("\n"); - } - - public void startchecksum() { - if (this.localchecksum == null) - this.localchecksum = new java.util.zip.CRC32(); - this.localchecksum.reset(); - } - - protected int endchecksum() { - long crc = this.localchecksum.getValue(); // get the digest value - crc = (crc & 0x00000000FFFFFFFFL); /* crc is 32 bits */ - this.lastchecksum = (int) crc; - return this.lastchecksum; - } - - protected byte[] readnbytes(int n) throws IOException { - byte[] bytes = new byte[n]; - try { - this.reader.get(bytes); - } catch (BufferUnderflowException e) { - throw new IOException("Short DATADMR"); - } - return bytes; - } - - protected ByteBuffer readn(int n) throws IOException { - byte[] bytes = readnbytes(n); - ByteBuffer result = ByteBuffer.wrap(bytes).order(this.remoteorder); - return result; - } - - protected ByteBuffer checksum(int n) throws IOException { - byte[] bytes = readnbytes(n); - localchecksum.update(bytes, 0, n); - if (DUMPCSUM) { - System.err.print("CCC "); - for (int i = 0; i < n; i++) { - System.err.printf("%02x", bytes[i]); - } - System.err.println(); - } - ByteBuffer result = ByteBuffer.wrap(bytes).order(this.remoteorder); - return result; - } - - public void format(String s) { - buf.append(String.format(s)); - } - - char hexchar(int i) { - return "0123456789ABCDEF".charAt((i & 0xF)); - } - -} diff --git a/dap4/src/test/java/dap4/test/TestConstraints.java b/dap4/src/test/java/dap4/test/TestConstraints.java index 13ea6842f9..1477a605fb 100644 --- a/dap4/src/test/java/dap4/test/TestConstraints.java +++ b/dap4/src/test/java/dap4/test/TestConstraints.java @@ -14,17 +14,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.nc2.dataset.NetcdfDataset; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; import java.lang.invoke.MethodHandles; import java.nio.file.NoSuchFileException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * This Test uses the JUNIT Version 4 parameterized test mechanism. @@ -40,7 +33,6 @@ public class TestConstraints extends DapTestCommon implements Dap4ManifestIF { // Constants // Define the server to use - protected static final String SERVERNAME = "d4ts"; protected static final String SERVER = "remotetest.unidata.ucar.edu"; protected static final int SERVERPORT = -1; protected static final String SERVERPATH = "d4ts/testfiles"; @@ -114,7 +106,6 @@ public static List defineTestCases() { TestCase tc = new TestCase(file + "." + index, url, baseline, query); testcases.add(tc); } - // singleTest(0,testcases); // choose single test for debugging return testcases; } @@ -136,17 +127,11 @@ public TestConstraints(TestCaseCommon tc) { @Before public void setup() { - // Set any properties - // props.prop_visual = true; - // props.prop_baseline = true; super.setup(); } @Test public void test() throws Exception { - int i, c; - StringBuilder sb = new StringBuilder(); - NetcdfDataset ncfile; try { ncfile = openDataset(tc.url); diff --git a/dap4/src/test/java/dap4/test/TestDap4Url.java b/dap4/src/test/java/dap4/test/TestDap4Url.java index 336a5cfe78..c675149ece 100644 --- a/dap4/src/test/java/dap4/test/TestDap4Url.java +++ b/dap4/src/test/java/dap4/test/TestDap4Url.java @@ -5,7 +5,6 @@ package dap4.test; -import dap4.core.util.DapConstants; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -14,15 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.nc2.dataset.DatasetUrl; -import ucar.nc2.dataset.NetcdfDataset; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; import java.lang.invoke.MethodHandles; -import java.nio.file.NoSuchFileException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -47,7 +39,6 @@ public class TestDap4Url extends DapTestCommon implements Dap4ManifestIF { protected static String[] urls = {"https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc#dap4", "dap4://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc", "https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc", - // "https://remotetest.unidata.ucar.edu/thredds/dap4/testAll/H.1.1.nc", }; ////////////////////////////////////////////////// @@ -109,9 +100,6 @@ public TestDap4Url(TestCaseCommon tc) { @Before public void setup() { - // Set any properties - // props.prop_visual = true; - // props.prop_baseline = true; super.setup(); } diff --git a/dap4/src/test/java/dap4/test/TestHyrax.java b/dap4/src/test/java/dap4/test/TestHyrax.java index a8048e677a..95b74159d3 100644 --- a/dap4/src/test/java/dap4/test/TestHyrax.java +++ b/dap4/src/test/java/dap4/test/TestHyrax.java @@ -42,7 +42,6 @@ public class TestHyrax extends DapTestCommon implements Dap4ManifestIF { // Constants // Define the server to use - protected static final String SERVERNAME = "hyrax"; protected static final String SERVER = "test.opendap.org"; protected static final int SERVERPORT = -1; protected static final String SERVERPATH = "opendap"; @@ -122,8 +121,6 @@ public static List defineTestCases() { TestCase tc = new TestCase(file, url, baseline, query); testcases.add(tc); } - // singleTest("AIRS.2002.12.01.L3.RetStd_H031.v4.0.21.0.G06101132853.hdf", testcases); // choose single test for - // debugging return testcases; } ////////////////////////////////////////////////// @@ -144,9 +141,6 @@ public TestHyrax(TestCaseCommon tc) { @Before public void setup() { - // Set any properties - // props.prop_baseline = true; - // props.prop_visual = true; super.setup(); } diff --git a/dap4/src/test/java/dap4/test/TestParserCE.java b/dap4/src/test/java/dap4/test/TestParserCE.java index 134f6efb4a..438b183402 100644 --- a/dap4/src/test/java/dap4/test/TestParserCE.java +++ b/dap4/src/test/java/dap4/test/TestParserCE.java @@ -10,11 +10,8 @@ import dap4.core.ce.parser.CEParserImpl; import dap4.core.dmr.DMRFactory; import dap4.core.dmr.DapDataset; -import dap4.core.dmr.ErrorResponse; import dap4.core.dmr.parser.DOM4Parser; import dap4.core.dmr.parser.Dap4Parser; -import dap4.core.dmr.parser.ParseUtil; -import dap4.core.dmr.DMRPrinter; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -22,14 +19,9 @@ import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.PrintWriter; -import java.io.StringWriter; import java.lang.invoke.MethodHandles; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.regex.Pattern; /** * This Test uses the JUNIT Version 4 parameterized test mechanism. diff --git a/dap4/src/test/java/dap4/test/TestRaw.java b/dap4/src/test/java/dap4/test/TestRaw.java index 6fb2e18f6e..f57289e973 100644 --- a/dap4/src/test/java/dap4/test/TestRaw.java +++ b/dap4/src/test/java/dap4/test/TestRaw.java @@ -14,18 +14,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.nc2.dataset.NetcdfDataset; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; import java.lang.invoke.MethodHandles; import java.nio.file.NoSuchFileException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import static dap4.core.util.DapConstants.CHECKSUMATTRNAME; - /** * This Test uses the JUNIT Version 4 parameterized test mechanism. * The set of arguments for each test is encapsulated in a class @@ -54,7 +47,6 @@ public class TestRaw extends DapTestCommon implements Dap4ManifestIF { {"test_vlen2", "test_vlen3", "test_vlen4", "test_vlen5", "test_vlen6", "test_vlen7", "test_vlen8"}; // Attribute suppression - static String RE_ENDIAN = "\n[ \t]*[ \t]*"; static String RE_CHECKSUM = ":" + DapConstants.CHECKSUMATTRNAME; static String RE_DAP4_ENDIAN = ":" + DapConstants.LITTLEENDIANATTRNAME; static String RE_DAP4_CE = ":" + DapConstants.CEATTRNAME; @@ -104,7 +96,6 @@ public static List defineTestCases() { TestCase tc = new TestCase(name, url, baseline); testcases.add(tc); } - // singleTest("test_vlen3", testcases); // choose single test for debugging return testcases; } @@ -126,17 +117,12 @@ public TestRaw(TestCaseCommon tc) { @Before public void setup() { - // Set any properties - // props.prop_visual = true; - // props.prop_baseline = true; super.setup(); } @Test public void test() throws Exception { - int i, c; StringBuilder sb = new StringBuilder(); - // String url = buildURL(resourceroot + INPUTDIR, tc.name + INPUTEXT); String url = tc.url; NetcdfDataset ncfile; try { diff --git a/dap4/src/test/java/dap4/test/TestRemote.java b/dap4/src/test/java/dap4/test/TestRemote.java index 10ecf417f8..8c40522ef0 100644 --- a/dap4/src/test/java/dap4/test/TestRemote.java +++ b/dap4/src/test/java/dap4/test/TestRemote.java @@ -15,14 +15,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.nc2.dataset.NetcdfDataset; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; import java.lang.invoke.MethodHandles; import java.nio.file.NoSuchFileException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -40,7 +35,6 @@ public class TestRemote extends DapTestCommon implements Dap4ManifestIF { // Constants // Define the server to use - protected static final String SERVERNAME = "d4ts"; protected static final String SERVER = "remotetest.unidata.ucar.edu"; protected static final int SERVERPORT = -1; protected static final String SERVERPATH = "d4ts/testfiles"; @@ -107,7 +101,6 @@ public static List defineTestCases() { TestCase tc = new TestCase(name, url, baseline); testcases.add(tc); } - // singleTest("test_utf8", testcases); // choose single test for debugging return testcases; } @@ -129,17 +122,11 @@ public TestRemote(TestCaseCommon tc) { @Before public void setup() { - // Set any properties - // props.prop_visual = true; - // props.prop_baseline = true; super.setup(); } @Test public void test() throws Exception { - int i, c; - StringBuilder sb = new StringBuilder(); - System.err.println(">>> Test: " + tc.url); NetcdfDataset ncfile; diff --git a/httpservices/src/test/java/ucar/httpservices/TestThreading.java b/httpservices/src/test/java/ucar/httpservices/TestThreading.java index a489588755..b997843235 100644 --- a/httpservices/src/test/java/ucar/httpservices/TestThreading.java +++ b/httpservices/src/test/java/ucar/httpservices/TestThreading.java @@ -39,10 +39,6 @@ import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ucar.httpservices.HTTPException; -import ucar.httpservices.HTTPFactory; -import ucar.httpservices.HTTPMethod; -import ucar.httpservices.HTTPSession; import ucar.unidata.util.test.TestDir; import ucar.unidata.util.test.UnitTestCommon; import java.lang.invoke.MethodHandles; diff --git a/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPMethod.java b/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPMethod.java index 6cac7ac0e5..34f1dea037 100644 --- a/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPMethod.java +++ b/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPMethod.java @@ -51,7 +51,6 @@ public class TestHTTPMethod extends UnitTestCommon { // Constants protected final String baseurl = "http://" + TestDir.dap2TestServer + "/dts"; - static String relativebaseline = "/cdm/src/test/data/ucar/nc2/util/net"; static final String testcase = "test.01.dds"; @@ -63,17 +62,6 @@ public class TestHTTPMethod extends UnitTestCommon { ////////////////////////////////////////////////// - // Define the test sets - - int passcount = 0; - int xfailcount = 0; - int failcount = 0; - boolean verbose = true; - boolean pass = false; - - String datadir = null; - String threddsroot = null; - public TestHTTPMethod() { super(); setTitle("HTTP Method tests"); @@ -83,7 +71,6 @@ public TestHTTPMethod() { @Test public void testGetStream() throws Exception { String url = baseurl + "/" + testcase; - String baseline = getThreddsroot() + relativebaseline + "/" + testcase; logger.debug("*** Testing: HTTPMethod"); logger.debug("*** URL: {}", url); @@ -103,7 +90,6 @@ public void testGetStream() throws Exception { @Test public void testGetStreamPartial() throws Exception { String url = baseurl + "/" + testcase; - String baseline = getThreddsroot() + relativebaseline + "/" + testcase; logger.debug("*** Testing: HTTPMethod"); logger.debug("*** URL: {}", url); diff --git a/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPSession.java b/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPSession.java index 18f7d3aa6c..f2ccf3ad73 100755 --- a/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPSession.java +++ b/httpservices/src/test/java/ucar/nc2/util/net/TestHTTPSession.java @@ -135,7 +135,6 @@ public void testConfigure() throws Exception { BasicCredentialsProvider bcp = new BasicCredentialsProvider(); bcp.setCredentials(AuthScope.ANY, bp); session.setCredentialsProvider(bcp); - // session.setAuthorizationPreemptive(true); not implemented HTTPMethod method = HTTPFactory.Get(session, TESTURL1); method.execute(); diff --git a/httpservices/src/test/java/ucar/nc2/util/net/TestState.java b/httpservices/src/test/java/ucar/nc2/util/net/TestState.java index e80962d2a4..c320a16ed0 100644 --- a/httpservices/src/test/java/ucar/nc2/util/net/TestState.java +++ b/httpservices/src/test/java/ucar/nc2/util/net/TestState.java @@ -63,13 +63,6 @@ public class TestState extends UnitTestCommon { // Constants protected final String SESSIONURL = "http://" + TestDir.dap2TestServer + "/dts"; protected final String TESTSOURCE1 = SESSIONURL + "/test.01.dds"; - protected final String TESTSOURCE2 = SESSIONURL + "/test.02.dds"; - - static final public Charset UTF8 = Charset.forName("UTF-8"); - - ////////////////////////////////////////////////// - boolean verbose = false; - boolean pass = false; public TestState() { setTitle("HTTP Session and Method State tests"); diff --git a/httpservices/src/test/java/ucar/nc2/util/net/TestURIParse.java b/httpservices/src/test/java/ucar/nc2/util/net/TestURIParse.java index 4f241ba020..575bb9c9e9 100644 --- a/httpservices/src/test/java/ucar/nc2/util/net/TestURIParse.java +++ b/httpservices/src/test/java/ucar/nc2/util/net/TestURIParse.java @@ -33,12 +33,9 @@ package ucar.nc2.util.net; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ucar.httpservices.HTTPFactory; -import ucar.httpservices.HTTPMethod; import ucar.httpservices.HTTPUtil; import ucar.unidata.util.test.TestDir; import ucar.unidata.util.test.UnitTestCommon; @@ -58,23 +55,13 @@ public class TestURIParse extends UnitTestCommon { static final String CARON = "http://" + TestDir.remoteTestServer + "/thredds/cdmremote/scanCdmUnitTests/formats/hdf5/grid_1_3d_xyz_aug.h5?req=data&var=HDFEOS_INFORMATION/StructMetadata\\.0"; - static final String[] filetests = {}; - static final String[] httptests = {"http://ucar.edu:8081/dts/test\\/fake\\.01", CARON,}; ////////////////////////////////////////////////// // Define the test sets - - int passcount = 0; - int xfailcount = 0; - int failcount = 0; - boolean verbose = true; boolean pass = false; - String datadir = null; - String threddsroot = null; - public TestURIParse() { setTitle("HTTPUtil.parseToURI tests"); } @@ -120,36 +107,6 @@ public void testParse() throws Exception { Assert.assertTrue("TestMisc.testURX", pass); } - protected static boolean uriCompare(URI uri1, URI uri2) { - boolean ok = true; - ok = ok && uriPartCompare(uri1.getScheme(), uri2.getScheme()); - ok = ok && uriPartCompare(uri1.getHost(), uri2.getHost()); - ok = ok && (uri1.getPort() == uri2.getPort()); - ok = ok && uriPartCompare(uri1.getPath(), uri2.getPath()); - ok = ok && uriPartCompare(uri1.getQuery(), uri2.getQuery()); - ok = ok && uriPartCompare(uri1.getFragment(), uri2.getFragment()); - return ok; - } - - protected static boolean uriCompareRaw(URI uri1, URI uri2) { - boolean ok = true; - ok = ok && uriPartCompare(uri1.getScheme(), uri2.getScheme()); - ok = ok && uriPartCompare(uri1.getHost(), uri2.getHost()); - ok = ok && (uri1.getPort() == uri2.getPort()); - ok = ok && uriPartCompare(uri1.getRawPath(), uri2.getRawPath()); - ok = ok && uriPartCompare(uri1.getRawQuery(), uri2.getRawQuery()); - ok = ok && uriPartCompare(uri1.getRawFragment(), uri2.getRawFragment()); - return ok; - } - - protected static boolean uriPartCompare(String s1, String s2) { - if (s1 == s2) - return true; - if (s1 == null || s2 == null) - return false; - return (s1.equals(s2)); - } - protected static String dump(URI uri) { StringBuilder buf = new StringBuilder(); buf.append(uri.getScheme()).append("://"); diff --git a/opendap/src/test/java/opendap/test/TestClone.java b/opendap/src/test/java/opendap/test/TestClone.java index c23a98742d..f42eb56cd7 100755 --- a/opendap/src/test/java/opendap/test/TestClone.java +++ b/opendap/src/test/java/opendap/test/TestClone.java @@ -25,15 +25,8 @@ public class TestClone extends TestFiles { static final int ISDDS = 2; static final int ISERR = 3; - int kind = ISUNKNOWN; - - String[] testfilenames = null; - - boolean debug = false; static final String TITLE = "DAP DDS and DAS Clone Tests"; - String extension = null; - String[] xfailtests = null; public TestClone() { diff --git a/opendap/src/test/java/opendap/test/TestDConnect2.java b/opendap/src/test/java/opendap/test/TestDConnect2.java index 380497ae84..93c146d6e9 100644 --- a/opendap/src/test/java/opendap/test/TestDConnect2.java +++ b/opendap/src/test/java/opendap/test/TestDConnect2.java @@ -39,7 +39,6 @@ public class TestDConnect2 extends TestSources { TestSet currentTestSet = null; TestSetEnum[] whichtests = {TestSetEnum.Standard1, TestSetEnum.Constrained1, TestSetEnum.Remote2 - // TestSetEnum.Experimental }; final String[] XFAIL = {"test.01.das", "test.07.das"}; @@ -181,7 +180,6 @@ void testpart(TestPart part, String ce) { } catch (Exception hwe) { hwe.printStackTrace(); pass = false; - return; } } diff --git a/opendap/src/test/java/opendap/test/TestEncode.java b/opendap/src/test/java/opendap/test/TestEncode.java index df6086bf6d..329e6bf52d 100755 --- a/opendap/src/test/java/opendap/test/TestEncode.java +++ b/opendap/src/test/java/opendap/test/TestEncode.java @@ -9,7 +9,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ucar.httpservices.HTTPUtil; import ucar.nc2.util.EscapeStrings; import java.lang.invoke.MethodHandles; import java.net.URI; diff --git a/opendap/src/test/java/opendap/test/TestFiles.java b/opendap/src/test/java/opendap/test/TestFiles.java index b36ae149b0..5ce42c8c16 100644 --- a/opendap/src/test/java/opendap/test/TestFiles.java +++ b/opendap/src/test/java/opendap/test/TestFiles.java @@ -53,29 +53,6 @@ static String partext(TestPart part) { return ".dds"; } - static String accessTestData(String testprefix, String basename, TestPart part) throws Exception { - String fname = testprefix + "/" + basename + partext(part); - - String result = null; - try { - File f = new File(fname); - if (!f.canRead()) - return null; - FileReader fr = new FileReader(fname); - StringBuffer cbuf = new StringBuffer(); - int c; - while ((c = fr.read()) != -1) { - cbuf.append((char) c); - } - return cbuf.toString(); - } catch (Exception e) { - System.err.println("File io failure: " + e.toString()); - e.printStackTrace(); - throw e; - } - - } - protected String testdir = null; protected String baselinedir = null; protected String resultsdir = null; diff --git a/opendap/src/test/java/opendap/test/TestGroups.java b/opendap/src/test/java/opendap/test/TestGroups.java index d98f1c07e4..f3eafb2b34 100644 --- a/opendap/src/test/java/opendap/test/TestGroups.java +++ b/opendap/src/test/java/opendap/test/TestGroups.java @@ -92,21 +92,6 @@ void definetestcases() { testcases.add(new Testcase("Duplicate coordinate variable names in Grid", "dods://" + testserver + "/dts/docExample", "netcdf dods://" + testserver + "/dts/docExample {\n dimensions:\n lat = 180;\n lon = 360;\n time = 404;\n variables:\n double lat(lat=180);\n :fullName = \"latitude\";\n :units = \"degrees North\";\n double lon(lon=360);\n :fullName = \"longitude\";\n :units = \"degrees East\";\n double time(time=404);\n :units = \"seconds\";\n int sst(time=404, lat=180, lon=360);\n :_CoordinateAxes = \"time lat lon \";\n :fullName = \"Sea Surface Temperature\";\n :units = \"degrees centigrade\";\n}\n")); - /* - * Not currently available - * testcases.add(new Testcase("External user provided group example", - * "http://" + testserver + "/thredds/dodsC/testdods/K1VHR.nc", - * "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/K1VHR.cdl") - * ); - * - * /* Not currently available - * testcases.add(new Testcase("TestTDSLocal Failure", - * "http://" + testserver + "/thredds/dodsC/ExampleNcML/Agg.nc", - * "")); - * testcases.add(new Testcase("TestTDSLocal Failure", - * "http://localhost:8080/dts/structdupname", - * "")); - */ } } @@ -159,31 +144,4 @@ boolean process1(Testcase testcase) throws Exception { resultrdr.close(); return pass; } - - /** - * Remove any _lastModified attributes - * - * @param s The string to be modified - * @return The modified string - */ - String nolastmodified(String s) { - StringReader sr = new StringReader(s); - StringWriter sw = new StringWriter(); - BufferedReader br = new BufferedReader(sr); - String line; - try { - while ((line = br.readLine()) != null) { - if (line.contains("odified")) - continue; - sw.write(line + "\n"); - } - br.close(); - sr.close(); - sw.close(); - return sw.toString(); - } catch (IOException ioe) { - return null; - } - } - } diff --git a/opendap/src/test/java/opendap/test/TestMisc.java b/opendap/src/test/java/opendap/test/TestMisc.java index 8f307e8305..7354bd4a27 100644 --- a/opendap/src/test/java/opendap/test/TestMisc.java +++ b/opendap/src/test/java/opendap/test/TestMisc.java @@ -79,11 +79,6 @@ void definetestcases() { testcases.add(new Testcase("TestDODSArrayPrimitiveExample", "dods://" + testserver + "/dts/test.02", "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.02.cdl")); } else { - // This test changes too often and I no longer remember why it is here. - // testcases.add(new Testcase("TestBennoGrid Example", - // "dods://iridl.ldeo.columbia.edu/SOURCES/.NOAA/.NCEP/.CPC/.GLOBAL/.daily/dods", - // "file://"+threddsRoot + "/opendap/src/test/data/baselinemisc/dods.cdl") - // ); testcases .add(new Testcase("Constrained access", "dods://" + testserver + "/dts/test.22?exp.ThreeD[5:1:7][5:8][1:3]", "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.22ce.cdl")); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSArrayPrimitiveTypes.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSArrayPrimitiveTypes.java index d25ddf90de..f50f790dff 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSArrayPrimitiveTypes.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSArrayPrimitiveTypes.java @@ -219,8 +219,6 @@ public void testStrides() throws IOException { byte valb = ab.get(i); assert (valb == 3 * i); } - - // System.out.println("TestDODSArrayPrimitiveTypes TestStride ok"); } diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java index c79005047e..f5889746ac 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSRead.java @@ -51,9 +51,6 @@ public void testRead() throws IOException { // nested open("test.21"); open("test.22"); - // open( "test.23"); - // open( "test.31"); - // open( "test.32"); open("test.50"); // structure array open("test.53"); // nested structure in structure array diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java index 55368b0206..6f1203bed1 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSSequence.java @@ -78,7 +78,6 @@ public void testReadSequence() throws IOException { Array a = v.read(); assert a.getRank() == 1; assert a.getSize() == 5 : a.getSize(); - // NCdump.printArray(a, "person",System.out,null); int count = 0; int fib = 1, prev = 1; diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureArray.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureArray.java index ce3567ab90..a071ff900b 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureArray.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureArray.java @@ -12,7 +12,6 @@ import ucar.nc2.NetcdfFile; import ucar.nc2.Structure; import ucar.nc2.Variable; -import ucar.nc2.dataset.NetcdfDataset; import ucar.nc2.dataset.NetcdfDatasets; import ucar.unidata.util.test.UtilsTestStructureArray; import java.io.IOException; @@ -154,9 +153,6 @@ public void testSARead() throws IOException { StructureMembers.Member m = data.findMember("f"); assert m != null; - // assert m.getV() instanceof DODSVariable; - // DODSVariable dv = (DODSVariable) m.getV(); - // assert dv.hasCachedData(); Array a = data.getArray(m); Index ima = a.getIndex(); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java index 70c65d04ce..349bdc385b 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java @@ -13,7 +13,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ucar.nc2.Structure; import ucar.ma2.StructureData; import ucar.ma2.StructureDataIterator; @@ -29,9 +28,6 @@ public void utestConstrainedAccess() { // URL for the JPL QuikSCAT DODS File Server (DFS). String dfsURL = "http://dods.jpl.nasa.gov/dods-bin/nph-dods/catalogs/quikscat/L2B/quikscat_L2.dat"; String seqName = "QuikSCAT_L2B"; - String catTitleAttName = "DODS_Global.DODS_Title"; - String catAllowedDateRangeStartAttName = "DODS_Global.DODS_StartDate"; - String catAllowedDateRangeEndAttName = "DODS_Global.DODS_EndDate"; // Connect to the DFS. DODSNetcdfFile dfs = null; @@ -89,12 +85,6 @@ private void entryTest(StructureDataIterator dodsIt, BasicEntry expectedEntry, f int rev_num = curData.getScalarInt("rev_num"); int wvc_rows = curData.getScalarInt("wvc_rows"); String dodsUrl = curData.getScalarString("DODS_URL"); - // System.out.println( "year = " + year ); - // System.out.println( "day = " + day ); - // System.out.println( "hours = " + hours ); - // System.out.println( "minutes = " + minutes ); - // System.out.println( "longitude = " + longitude ); - // System.out.println( "dodsUrl = " + dodsUrl ); if ((year != expectedEntry.getYear()) || (day != expectedEntry.getDay()) || (hours != expectedEntry.getHours()) || (minutes != expectedEntry.getMinutes()) || (seconds != expectedEntry.getSeconds()) || (m_seconds != expectedEntry.getM_seconds()) || (longitude > expectedEntry.getLongitude() + longDelta) @@ -149,104 +139,40 @@ public int getYear() { return year; } - public void setYear(int year) { - this.year = year; - } - public int getDay() { return day; } - public void setDay(int day) { - this.day = day; - } - public int getHours() { return hours; } - public void setHours(int hours) { - this.hours = hours; - } - public int getMinutes() { return minutes; } - public void setMinutes(int minutes) { - this.minutes = minutes; - } - public int getSeconds() { return seconds; } - public void setSeconds(int seconds) { - this.seconds = seconds; - } - public int getM_seconds() { return m_seconds; } - public void setM_seconds(int m_seconds) { - this.m_seconds = m_seconds; - } - public float getLongitude() { return longitude; } - public void setLongitude(float longitude) { - this.longitude = longitude; - } - public int getRev_num() { return rev_num; } - public void setRev_num(int rev_num) { - this.rev_num = rev_num; - } - public int getWvc_rows() { return wvc_rows; } - public void setWvc_rows(int wvc_rows) { - this.wvc_rows = wvc_rows; - } - public String getDodsUrl() { return dodsUrl; } - - public void setDodsUrl(String dodsUrl) { - this.dodsUrl = dodsUrl; - } - - } } - -/* - * $Log: TestDODSStructureForSequence.java,v $ - * Revision 1.5 2006/02/16 23:02:44 caron - * *** empty log message *** - * - * Revision 1.4 2006/02/06 21:17:06 caron - * more fixes to dods parsing. - * ArraySequence.flatten() - * ncml.xml use default namespace. Only way I can get ncml in catalog to validate. - * ThreddsDataFactory refactor - * - * Revision 1.3 2005/07/25 00:07:12 caron - * cache debugging - * - * Revision 1.2 2005/05/11 00:10:10 caron - * refactor StuctureData, dt.point - * - * Revision 1.1 2004/11/19 21:42:28 edavis - * Test how DODSStructure handles reading DODS sequence (uses JPL QuikSCAT DODS File Server for test server). - * - */ diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java index 94b900aa73..89b56403c1 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureScalarsNested.java @@ -291,9 +291,6 @@ void CheckByteValue(Array a) { } void CheckInt16(Variable v) throws IOException { - // int16 - // assert(null != (v = dodsfile.findVariable("types.integers.i16"))); - // assert v.getName().equals("types.integers.i16"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.SHORT; @@ -310,10 +307,6 @@ void CheckInt16Value(Array a) { } void CheckInt32(Variable v) throws IOException { - - // int32 - // assert(null != (v = dodsfile.findVariable("types.integers.i32"))); - // assert v.getName().equals("types.integers.i32"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.INT; @@ -330,10 +323,6 @@ void CheckInt32Value(Array a) { } void CheckUInt32(Variable v) throws IOException { - - // uint32 - // assert(null != (v = dodsfile.findVariable("types.integers.ui32"))); - // assert v.getName().equals("types.integers.ui32"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.UINT : v.getDataType(); @@ -350,10 +339,6 @@ void CheckUInt32Value(Array a) { } void CheckUint16(Variable v) throws IOException { - - // uint16 - // assert(null != (v = dodsfile.findVariable("types.integers.ui16"))); - // assert v.getName().equals("types.integers.ui16"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.USHORT : v.getDataType(); @@ -369,17 +354,6 @@ void CheckUInt16Value(Array a) { assert (vali == 0); } - void CheckLong32(Variable v) throws IOException { - - // uint32 - // assert(null != (v = dodsfile.findVariable("types.integers.ui32"))); - // assert v.getName().equals("types.integers.ui32"); - assert v.getRank() == 0; - assert v.getSize() == 1; - assert v.getDataType() == DataType.LONG : v.getDataType(); - CheckLongValue(v.read()); - } - void CheckLongValue(Array a) { assert a.getRank() == 0; assert a.getSize() == 1; @@ -390,10 +364,6 @@ void CheckLongValue(Array a) { } void CheckF(Variable v) throws IOException { - - // float - // assert(null != (v = dodsfile.findVariable("types.floats.f32"))); - // assert v.getName().equals("types.floats.f32"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.FLOAT : v.getDataType(); @@ -410,10 +380,6 @@ void CheckFValue(Array a) { } void CheckD(Variable v) throws IOException { - - // double - // assert(null != (v = dodsfile.findVariable("types.floats.f64"))); - // assert v.getName().equals("types.floats.f64"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.DOUBLE : v.getDataType(); @@ -430,10 +396,6 @@ void CheckDValue(Array a) { } void CheckS(Variable v) throws IOException { - - // string - // assert(null != (v = dodsfile.findVariable("types.strings.s"))); - // assert v.getName().equals("types.strings.s"); assert v.getRank() == 0; assert v.getDataType() == DataType.STRING : v.getDataType(); CheckSValue(v.read()); @@ -447,10 +409,6 @@ void CheckSValue(Array a) { } void CheckUrl(Variable v) throws IOException { - - // url - // assert(null != (v = dodsfile.findVariable("types.strings.u"))); - // assert v.getName().equals("types.strings.u"); assert v.getRank() == 0; assert v.getDataType() == DataType.STRING : v.getDataType(); String str = v.readScalarString(); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSSubset.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSSubset.java index 4b9cd4d8c8..5ecde00136 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSSubset.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSSubset.java @@ -127,9 +127,6 @@ void CheckByteValue(Array a) { } void CheckInt16(Variable v) throws IOException { - // int16 - // assert(null != (v = dodsfile.findVariable("types.integers.i16"))); - // assert v.getName().equals("types.integers.i16"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.SHORT; @@ -146,10 +143,6 @@ void CheckInt16Value(Array a) { } void CheckInt32(Variable v) throws IOException { - - // int32 - // assert(null != (v = dodsfile.findVariable("types.integers.i32"))); - // assert v.getName().equals("types.integers.i32"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.INT; @@ -166,10 +159,6 @@ void CheckInt32Value(Array a) { } void CheckUint32(Variable v) throws IOException { - - // uint32 - // assert(null != (v = dodsfile.findVariable("types.integers.ui32"))); - // assert v.getName().equals("types.integers.ui32"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.UINT : v.getDataType(); @@ -186,10 +175,6 @@ void CheckUint32Value(Array a) { } void CheckUint16(Variable v) throws IOException { - - // uint16 - // assert(null != (v = dodsfile.findVariable("types.integers.ui16"))); - // assert v.getName().equals("types.integers.ui16"); assert v.getRank() == 0; assert v.getSize() == 1; assert v.getDataType() == DataType.USHORT : v.getDataType(); @@ -204,94 +189,4 @@ void CheckUInt16Value(Array a) { int vali = ((ArrayShort.D0) a).get(); assert (vali == 0); } - - void CheckLong32(Variable v) throws IOException { - - // uint32 - // assert(null != (v = dodsfile.findVariable("types.integers.ui32"))); - // assert v.getName().equals("types.integers.ui32"); - assert v.getRank() == 0; - assert v.getSize() == 1; - assert v.getDataType() == DataType.LONG : v.getDataType(); - CheckLongValue(v.read()); - } - - void CheckLongValue(Array a) { - assert a.getRank() == 0; - assert a.getSize() == 1; - assert a.getElementType() == long.class; - assert a instanceof ArrayLong.D0; - long vall = ((ArrayLong.D0) a).get(); - assert (vall == 0); - } - - void CheckF(Variable v) throws IOException { - - // float - // assert(null != (v = dodsfile.findVariable("types.floats.f32"))); - // assert v.getName().equals("types.floats.f32"); - assert v.getRank() == 0; - assert v.getSize() == 1; - assert v.getDataType() == DataType.FLOAT : v.getDataType(); - CheckFValue(v.read()); - } - - void CheckFValue(Array a) { - assert a.getRank() == 0; - assert a.getSize() == 1; - assert a.getElementType() == float.class; - assert a instanceof ArrayFloat.D0; - float valf = ((ArrayFloat.D0) a).get(); - assert (valf == 0.0); - } - - void CheckD(Variable v) throws IOException { - - // double - // assert(null != (v = dodsfile.findVariable("types.floats.f64"))); - // assert v.getName().equals("types.floats.f64"); - assert v.getRank() == 0; - assert v.getSize() == 1; - assert v.getDataType() == DataType.DOUBLE : v.getDataType(); - CheckDValue(v.read()); - } - - void CheckDValue(Array a) { - assert a.getRank() == 0; - assert a.getSize() == 1; - assert a.getElementType() == double.class; - assert a instanceof ArrayDouble.D0; - double vald = ((ArrayDouble.D0) a).get(); - assert (vald == 1000.0); - } - - void CheckS(Variable v) throws IOException { - - // string - // assert(null != (v = dodsfile.findVariable("types.strings.s"))); - // assert v.getName().equals("types.strings.s"); - assert v.getRank() == 0; - assert v.getDataType() == DataType.STRING : v.getDataType(); - CheckSValue(v.read()); - } - - void CheckSValue(Array a) { - assert a.getRank() == 0; - assert a.getElementType() == String.class; - String str = (String) a.getObject(a.getIndex()); - assert str.equals("This is a data test string (pass 0)."); - } - - void CheckUrl(Variable v) throws IOException { - - // url - // assert(null != (v = dodsfile.findVariable("types.strings.u"))); - // assert v.getName().equals("types.strings.u"); - assert v.getRank() == 0; - assert v.getDataType() == DataType.STRING : v.getDataType(); - String str = v.readScalarString(); - assert str.equals("http://www.opendap.org") || str.equals("http://www.dods.org") : str; - } - - } diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java index 23a4f864ee..02abc94425 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSnestedSequence.java @@ -80,7 +80,6 @@ public void testNestedSequenceParent() throws IOException { Array a = v.read(); // DODSNetcdfFile.readFromServer = assert a.getRank() == 1; assert a.getSize() == 5 : a.getSize(); - // NCdump.printArray(a, "person",System.out,null); int count = 0; int fib = 1, prev = 1; @@ -118,24 +117,6 @@ public void utestNestedSequence() throws IOException, InvalidRangeException { assert v.getRank() == 1; assert v.isVariableLength(); - /* - * Array sa = v.readAllStructures(null, true); // DODSNetcdfFile.readFromServer = - * assert sa.getRank() == 1; - * assert sa.getSize() == 25 : sa.getSize(); - * - * int count = 0; - * IndexIterator iter = sa.getIndexIterator(); - * while (iter.hasNext()) { - * StructureData data = (StructureData) iter.next(); - * - * assert data.findMember("foo") != null; - * - * int foo = data.getScalarInt("foo"); - * assert foo == count*16 : foo; - * count++; - * } - */ - Array a = v.read(); // // DODSNetcdfFile.readFromServer = assert a.getRank() == 1; assert a.getSize() == 25 : a.getSize(); @@ -184,51 +165,5 @@ public void utestCE() throws IOException, InvalidRangeException { StructureMembers firstMembers = firstInner.getStructureMembers(); assert firstMembers.findMember("foo") != null; assert firstMembers.findMember("bar") != null; - - // StructureMembers.Member timeMember = innerMembers.findMember(timeVar.getShortName()); - } - - - // server+"NestedSeq2", "person1.age,person1.stuff&person1.age=3" - - /* - * boolean show = false; - * public void testReadNestedSequence() throws IOException { - * - * DODSNetcdfFile dodsfile = TestDODSRead.open("test.23"); - * - * DODSStructure struct = dodsfile.findStructure("exp"); - * assert null != struct; - * - * DODSStructure datas = struct.read(); - * - * DODSSequence seq = (DODSSequence) datas.findStructureByShortName("ComplexSequence"); - * assert null != seq; - * - * int count = 0; - * Iterator iter = seq.getSequenceIterator(null); - * while (iter.hasNext()) { - * if (debug) System.out.println(" testReadStructure row = "+ count); - * count++; - * DODSStructure data = (DODSStructure) iter.next(); - * - * DODSGrid profile = (DODSGrid) data.findStructureByShortName("profile"); - * assert profile != null; - * DODSVariable v = profile.findVariableByShortName("depth"); - * assert v != null; - * assert v.hasCachedData(); - * Array a = v.read(); - * assert a.getRank() == 1; - * - * Dimension d = dodsfile.findDimension("exp.ComplexSequence.profile.depth"); - * assert d != null; - * assert d.getLength() == a.getSize(); - * - * if (debug) System.out.println(profile.getName()+" == \n"+profile); - * break; - * } - * } - */ - } From 18c698ba26be9b71fc00f6a8313eab980fbc6f3f Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Mon, 1 Apr 2024 16:28:44 -0600 Subject: [PATCH 5/6] Remove dead code in tests --- .../java/opendap/test/TestDuplicates.java | 14 ++++------ .../test/java/opendap/test/TestGroups.java | 26 +++++++------------ .../src/test/java/opendap/test/TestMisc.java | 15 ++++------- 3 files changed, 19 insertions(+), 36 deletions(-) diff --git a/opendap/src/test/java/opendap/test/TestDuplicates.java b/opendap/src/test/java/opendap/test/TestDuplicates.java index 506f8d61ac..9c6e21c53d 100644 --- a/opendap/src/test/java/opendap/test/TestDuplicates.java +++ b/opendap/src/test/java/opendap/test/TestDuplicates.java @@ -75,15 +75,11 @@ public void testDuplicates() throws Exception { String testserver = TestDir.dap2TestServer; List results = new ArrayList(); - if (true) { - results.add(new Result("Top and field vars have same names", "http://" + testserver + "/dts/structdupname", - "netcdf dods://" + testserver + "/dts/structdupname {\n" + " variables:\n" + " int time;\n" - + "Structure {\n" + " float time;\n" + "} record;\n" + "}")); - } - if (true) { - results.add(new Result("TestFailure", "http://" + testserver + "/dts/simplestruct", "netcdf dods://" + testserver - + "/dts/simplestruct {\n" + " variables:\n" + "Structure {\n" + " int i32;\n" + "} types;\n" + "}")); - } + results.add(new Result("Top and field vars have same names", "http://" + testserver + "/dts/structdupname", + "netcdf dods://" + testserver + "/dts/structdupname {\n" + " variables:\n" + " int time;\n" + + "Structure {\n" + " float time;\n" + "} record;\n" + "}")); + results.add(new Result("TestFailure", "http://" + testserver + "/dts/simplestruct", "netcdf dods://" + testserver + + "/dts/simplestruct {\n" + " variables:\n" + "Structure {\n" + " int i32;\n" + "} types;\n" + "}")); boolean pass = true; for (Result result : results) { System.out.println("TestDuplicates: " + result.url); diff --git a/opendap/src/test/java/opendap/test/TestGroups.java b/opendap/src/test/java/opendap/test/TestGroups.java index f3eafb2b34..d20879532d 100644 --- a/opendap/src/test/java/opendap/test/TestGroups.java +++ b/opendap/src/test/java/opendap/test/TestGroups.java @@ -75,25 +75,17 @@ public TestGroups() throws Exception { } void definetestcases() { - String threddsRoot = getThreddsroot(); testcases = new ArrayList<>(); - if (false) {// use this arm to do debugging - testcases.add(new Testcase("External user provided group example", - "http://" + testserver + "/thredds/dodsC/testdods/K1VHR.nc", - "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/K1VHR.cdl")); - } else { + testcases.add(new Testcase("Simple multiple groups", "dods://" + testserver + "/dts/group.test1", "netcdf dods://" + + testserver + + "/dts/group.test1 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nfloat f32;\n}\n}\n")); + testcases.add(new Testcase("Duplicate variable names in different groups", + "dods://" + testserver + "/dts/group.test2", "netcdf dods://" + testserver + + "/dts/group.test2 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nint i32;\n}\n}\n")); + testcases.add(new Testcase("Duplicate coordinate variable names in Grid", + "dods://" + testserver + "/dts/docExample", "netcdf dods://" + testserver + + "/dts/docExample {\n dimensions:\n lat = 180;\n lon = 360;\n time = 404;\n variables:\n double lat(lat=180);\n :fullName = \"latitude\";\n :units = \"degrees North\";\n double lon(lon=360);\n :fullName = \"longitude\";\n :units = \"degrees East\";\n double time(time=404);\n :units = \"seconds\";\n int sst(time=404, lat=180, lon=360);\n :_CoordinateAxes = \"time lat lon \";\n :fullName = \"Sea Surface Temperature\";\n :units = \"degrees centigrade\";\n}\n")); - testcases.add(new Testcase("Simple multiple groups", "dods://" + testserver + "/dts/group.test1", "netcdf dods://" - + testserver - + "/dts/group.test1 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nfloat f32;\n}\n}\n")); - testcases.add(new Testcase("Duplicate variable names in different groups", - "dods://" + testserver + "/dts/group.test2", "netcdf dods://" + testserver - + "/dts/group.test2 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nint i32;\n}\n}\n")); - testcases.add(new Testcase("Duplicate coordinate variable names in Grid", - "dods://" + testserver + "/dts/docExample", "netcdf dods://" + testserver - + "/dts/docExample {\n dimensions:\n lat = 180;\n lon = 360;\n time = 404;\n variables:\n double lat(lat=180);\n :fullName = \"latitude\";\n :units = \"degrees North\";\n double lon(lon=360);\n :fullName = \"longitude\";\n :units = \"degrees East\";\n double time(time=404);\n :units = \"seconds\";\n int sst(time=404, lat=180, lon=360);\n :_CoordinateAxes = \"time lat lon \";\n :fullName = \"Sea Surface Temperature\";\n :units = \"degrees centigrade\";\n}\n")); - - } } @Test diff --git a/opendap/src/test/java/opendap/test/TestMisc.java b/opendap/src/test/java/opendap/test/TestMisc.java index 7354bd4a27..4442b76200 100644 --- a/opendap/src/test/java/opendap/test/TestMisc.java +++ b/opendap/src/test/java/opendap/test/TestMisc.java @@ -75,17 +75,12 @@ public TestMisc() { void definetestcases() { String threddsRoot = getThreddsroot(); testcases = new ArrayList(); - if (false) { // use this arm for debugging individual cases - testcases.add(new Testcase("TestDODSArrayPrimitiveExample", "dods://" + testserver + "/dts/test.02", - "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.02.cdl")); - } else { - testcases - .add(new Testcase("Constrained access", "dods://" + testserver + "/dts/test.22?exp.ThreeD[5:1:7][5:8][1:3]", - "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.22ce.cdl")); - testcases.add(new Testcase("TestDODSArrayPrimitiveExample", "dods://" + testserver + "/dts/test.02", - "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.02.cdl")); + testcases + .add(new Testcase("Constrained access", "dods://" + testserver + "/dts/test.22?exp.ThreeD[5:1:7][5:8][1:3]", + "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.22ce.cdl")); + testcases.add(new Testcase("TestDODSArrayPrimitiveExample", "dods://" + testserver + "/dts/test.02", + "file://" + threddsRoot + "/opendap/src/test/data/baselinemisc/test.02.cdl")); - } } From 0e933a4830ee7d40d503b2b7f4812d9aafcfa980 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Mon, 1 Apr 2024 16:33:39 -0600 Subject: [PATCH 6/6] Spotless formatting --- dap4/src/test/java/dap4/test/TestDap4Url.java | 3 +-- opendap/src/test/java/opendap/test/TestDConnect2.java | 3 +-- opendap/src/test/java/opendap/test/TestDuplicates.java | 4 ++-- opendap/src/test/java/opendap/test/TestGroups.java | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dap4/src/test/java/dap4/test/TestDap4Url.java b/dap4/src/test/java/dap4/test/TestDap4Url.java index c675149ece..47c125b4aa 100644 --- a/dap4/src/test/java/dap4/test/TestDap4Url.java +++ b/dap4/src/test/java/dap4/test/TestDap4Url.java @@ -38,8 +38,7 @@ public class TestDap4Url extends DapTestCommon implements Dap4ManifestIF { // Legal url formats protected static String[] urls = {"https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc#dap4", "dap4://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc", - "https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc", - }; + "https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc",}; ////////////////////////////////////////////////// // Static Fields diff --git a/opendap/src/test/java/opendap/test/TestDConnect2.java b/opendap/src/test/java/opendap/test/TestDConnect2.java index 93c146d6e9..7d395b9e03 100644 --- a/opendap/src/test/java/opendap/test/TestDConnect2.java +++ b/opendap/src/test/java/opendap/test/TestDConnect2.java @@ -38,8 +38,7 @@ public class TestDConnect2 extends TestSources { boolean pass = false; TestSet currentTestSet = null; - TestSetEnum[] whichtests = {TestSetEnum.Standard1, TestSetEnum.Constrained1, TestSetEnum.Remote2 - }; + TestSetEnum[] whichtests = {TestSetEnum.Standard1, TestSetEnum.Constrained1, TestSetEnum.Remote2}; final String[] XFAIL = {"test.01.das", "test.07.das"}; diff --git a/opendap/src/test/java/opendap/test/TestDuplicates.java b/opendap/src/test/java/opendap/test/TestDuplicates.java index 9c6e21c53d..04c015a682 100644 --- a/opendap/src/test/java/opendap/test/TestDuplicates.java +++ b/opendap/src/test/java/opendap/test/TestDuplicates.java @@ -76,8 +76,8 @@ public void testDuplicates() throws Exception { List results = new ArrayList(); results.add(new Result("Top and field vars have same names", "http://" + testserver + "/dts/structdupname", - "netcdf dods://" + testserver + "/dts/structdupname {\n" + " variables:\n" + " int time;\n" - + "Structure {\n" + " float time;\n" + "} record;\n" + "}")); + "netcdf dods://" + testserver + "/dts/structdupname {\n" + " variables:\n" + " int time;\n" + "Structure {\n" + + " float time;\n" + "} record;\n" + "}")); results.add(new Result("TestFailure", "http://" + testserver + "/dts/simplestruct", "netcdf dods://" + testserver + "/dts/simplestruct {\n" + " variables:\n" + "Structure {\n" + " int i32;\n" + "} types;\n" + "}")); boolean pass = true; diff --git a/opendap/src/test/java/opendap/test/TestGroups.java b/opendap/src/test/java/opendap/test/TestGroups.java index d20879532d..4c12ce7ac6 100644 --- a/opendap/src/test/java/opendap/test/TestGroups.java +++ b/opendap/src/test/java/opendap/test/TestGroups.java @@ -76,9 +76,9 @@ public TestGroups() throws Exception { void definetestcases() { testcases = new ArrayList<>(); - testcases.add(new Testcase("Simple multiple groups", "dods://" + testserver + "/dts/group.test1", "netcdf dods://" - + testserver - + "/dts/group.test1 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nfloat f32;\n}\n}\n")); + testcases.add(new Testcase("Simple multiple groups", "dods://" + testserver + "/dts/group.test1", + "netcdf dods://" + testserver + + "/dts/group.test1 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nfloat f32;\n}\n}\n")); testcases.add(new Testcase("Duplicate variable names in different groups", "dods://" + testserver + "/dts/group.test2", "netcdf dods://" + testserver + "/dts/group.test2 {\ngroup: g1 {\nvariables:\nint i32;\n}\ngroup: g2 {\nvariables:\nint i32;\n}\n}\n"));