From 014b1af65435d0d59c29a1049df980e4281a9fd6 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Fri, 5 Apr 2024 09:40:06 -0600 Subject: [PATCH 1/4] Replace references to remotetest Replace references to remotetest with references to localhost test server --- .../java/opendap/test/TestGrid1.java | 6 +++--- .../java/opendap/test/TestGrid2.java | 5 ++--- .../java/opendap/test/TestNcmlWithOpendap.java | 5 ++--- .../java/thredds/server/fileserver/TestHTTP.java | 4 ++-- .../java/ucar/nc2/util/net/TestFormBuilder.java | 4 ++-- .../java/ucar/nc2/util/net/TestMisc.java | 12 ++++++------ .../java/ucar/nc2/util/net/TestTomcatAuth.java | 6 +++--- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/tds/src/integrationTests/java/opendap/test/TestGrid1.java b/tds/src/integrationTests/java/opendap/test/TestGrid1.java index 5996a16b00..4ba2d00133 100644 --- a/tds/src/integrationTests/java/opendap/test/TestGrid1.java +++ b/tds/src/integrationTests/java/opendap/test/TestGrid1.java @@ -10,10 +10,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import thredds.test.util.TdsUnitTestCommon; +import thredds.test.util.TestOnLocalServer; import ucar.nc2.NetcdfFiles; import ucar.nc2.dataset.NetcdfDataset; import ucar.nc2.dataset.NetcdfDatasets; -import ucar.unidata.util.test.TestDir; import java.lang.invoke.MethodHandles; @@ -36,7 +36,7 @@ public class TestGrid1 extends TdsUnitTestCommon { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - static final protected String URLPATH = "/thredds/dodsC/scanLocal/testgrid1.nc"; + static final protected String URLPATH = "dodsC/scanLocal/testgrid1.nc"; public TestGrid1() { setTitle("Simple DAP Grid"); @@ -46,7 +46,7 @@ public TestGrid1() { @Test public void testGrid1() throws Exception { System.out.println("TestGrid1:"); - String url = "dods://" + TestDir.remoteTestServer + URLPATH; + String url = "dods://" + TestOnLocalServer.server + URLPATH; boolean pass = true; NetcdfDataset ncfile = null; diff --git a/tds/src/integrationTests/java/opendap/test/TestGrid2.java b/tds/src/integrationTests/java/opendap/test/TestGrid2.java index 4c3eecfe01..30b16cc050 100644 --- a/tds/src/integrationTests/java/opendap/test/TestGrid2.java +++ b/tds/src/integrationTests/java/opendap/test/TestGrid2.java @@ -14,7 +14,6 @@ import ucar.nc2.dataset.NetcdfDataset; import ucar.nc2.dataset.NetcdfDatasets; import ucar.nc2.write.Ncdump; -import ucar.unidata.util.test.TestDir; import java.io.IOException; import java.io.StringWriter; @@ -38,7 +37,7 @@ public class TestGrid2 extends TdsUnitTestCommon { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - static final protected String URLPATH = "/thredds/dodsC/scanLocal/testgrid2.nc"; + static final protected String URLPATH = "dodsC/scanLocal/testgrid2.nc"; public TestGrid2() { setTitle("DAP Grid with repeated dimension"); @@ -48,7 +47,7 @@ public TestGrid2() { @Test public void testGrid2() throws Exception { System.out.println("TestGrid2:"); - String url = "dods://" + TestDir.remoteTestServer + URLPATH; + String url = "dods://" + TestOnLocalServer.server + URLPATH; boolean pass = true; try (NetcdfDataset ncfile = NetcdfDatasets.openDataset(url)) { System.out.println("url: " + url); diff --git a/tds/src/integrationTests/java/opendap/test/TestNcmlWithOpendap.java b/tds/src/integrationTests/java/opendap/test/TestNcmlWithOpendap.java index ccdae3fd53..e6d2742b09 100644 --- a/tds/src/integrationTests/java/opendap/test/TestNcmlWithOpendap.java +++ b/tds/src/integrationTests/java/opendap/test/TestNcmlWithOpendap.java @@ -14,15 +14,14 @@ import ucar.nc2.NetcdfFile; import ucar.nc2.Variable; import ucar.nc2.dataset.NetcdfDatasets; -import ucar.unidata.util.test.TestDir; public class TestNcmlWithOpendap { private static final double[] expectedValues = new double[] {Double.NaN, 1, 2, 3}; @Test public void shouldUseNcmlToModifyDatasetScanValues() throws IOException { - final String path = "/thredds/dodsC/EnhancedDatasetScan/testgrid1.nc"; - final String url = "dods://" + TestDir.remoteTestServer + path; + final String path = "dodsC/EnhancedDatasetScan/testgrid1.nc"; + final String url = "dods://" + TestOnLocalServer.server + path; try (NetcdfFile ncFile = NetcdfDatasets.openDataset(url)) { final Variable var = ncFile.findVariable("enhancedVar"); assertThat((Object) var).isNotNull(); diff --git a/tds/src/integrationTests/java/thredds/server/fileserver/TestHTTP.java b/tds/src/integrationTests/java/thredds/server/fileserver/TestHTTP.java index b66c4eace8..1b9612db3d 100644 --- a/tds/src/integrationTests/java/thredds/server/fileserver/TestHTTP.java +++ b/tds/src/integrationTests/java/thredds/server/fileserver/TestHTTP.java @@ -10,6 +10,7 @@ import thredds.client.catalog.Dataset; import thredds.client.catalog.ServiceType; import thredds.client.catalog.tools.DataFactory; +import thredds.test.util.TestOnLocalServer; import ucar.ma2.Array; import ucar.ma2.Index; import ucar.nc2.Attribute; @@ -20,7 +21,6 @@ import ucar.nc2.dataset.NetcdfDataset; import ucar.nc2.dataset.NetcdfDatasets; import ucar.unidata.util.test.Assert2; -import ucar.unidata.util.test.TestDir; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.Formatter; @@ -29,7 +29,7 @@ public class TestHTTP { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - String url = "http://" + TestDir.remoteTestServer + "/thredds/fileServer/scanLocal/mydata1.nc"; + String url = "http://" + TestOnLocalServer.server + "fileServer/scanLocal/mydata1.nc"; @Test public void testOpenNetcdfFile() throws IOException { diff --git a/tds/src/integrationTests/java/ucar/nc2/util/net/TestFormBuilder.java b/tds/src/integrationTests/java/ucar/nc2/util/net/TestFormBuilder.java index 7a71babe67..c4986e3f96 100644 --- a/tds/src/integrationTests/java/ucar/nc2/util/net/TestFormBuilder.java +++ b/tds/src/integrationTests/java/ucar/nc2/util/net/TestFormBuilder.java @@ -15,8 +15,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import thredds.test.util.TdsUnitTestCommon; +import thredds.test.util.TestOnLocalServer; import ucar.httpservices.*; -import ucar.unidata.util.test.TestDir; import java.io.*; import java.lang.invoke.MethodHandles; @@ -58,7 +58,7 @@ public class TestFormBuilder extends TdsUnitTestCommon { // This needs to be a real site in order to get // the request info - static final String NULLURL = "http://" + TestDir.remoteTestServer; + static final String NULLURL = "http://" + TestOnLocalServer.server; ////////////////////////////////////////////////// // Static Fields diff --git a/tds/src/integrationTests/java/ucar/nc2/util/net/TestMisc.java b/tds/src/integrationTests/java/ucar/nc2/util/net/TestMisc.java index 1ec7b1a76d..413505fbe8 100644 --- a/tds/src/integrationTests/java/ucar/nc2/util/net/TestMisc.java +++ b/tds/src/integrationTests/java/ucar/nc2/util/net/TestMisc.java @@ -12,13 +12,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import thredds.test.util.TdsUnitTestCommon; +import thredds.test.util.TestOnLocalServer; import ucar.httpservices.HTTPException; import ucar.httpservices.HTTPFactory; import ucar.httpservices.HTTPMethod; import ucar.httpservices.HTTPSession; import ucar.nc2.dataset.DatasetUrl; import ucar.nc2.util.EscapeStrings; -import ucar.unidata.util.test.TestDir; import java.lang.invoke.MethodHandles; import java.util.List; @@ -47,7 +47,7 @@ public TestMisc() { setTitle("HTTP Session tests"); } - static protected final String server = "http://" + TestDir.remoteTestServer; + static protected final String server = "http://" + TestOnLocalServer.server; static final String[] esinputs = {server + "/dts/test.01", server + "///xx/", server + "/<>^/`/",}; static final String[] esoutputs = {server + "/dts/test.01", server + "///xx/", server + "/%3c%3e%5e/%60/",}; @@ -72,7 +72,7 @@ public void testEscapeStrings() throws Exception { public void testUTF8Stream() throws Exception { pass = true; - String catalogName = "http://" + TestDir.remoteTestServer + "/thredds/catalog.xml"; + String catalogName = "http://" + TestOnLocalServer.server + "catalog.xml"; try (HTTPMethod m = HTTPFactory.Get(catalogName)) { int statusCode = m.execute(); @@ -109,7 +109,7 @@ public void testGetProtocols() { String tag = "TestMisc.testGetProtocols"; Assert.assertTrue(tag, protocheck("http://server/thredds/dodsC/", "http:")); Assert.assertTrue(tag, - protocheck("dods://" + TestDir.remoteTestServer + "/thredds/dodsC/grib/NCEP/NAM/CONUS_12km/best", "dods:")); + protocheck("dods://" + TestOnLocalServer.server + "dodsC/grib/NCEP/NAM/CONUS_12km/best", "dods:")); Assert.assertTrue(tag, protocheck("dap4://ucar.edu:8080/x/y/z", "dap4:")); Assert.assertTrue(tag, protocheck("dap4:https://ucar.edu:8080/x/y/z", "dap4:https:")); Assert.assertTrue(tag, protocheck("file:///x/y/z", "file:")); @@ -128,7 +128,7 @@ public void testGetProtocols() { @Test public void testByteRange() { - String file = "http://" + TestDir.remoteTestServer + "/thredds/fileServer/scanLocal/testData.nc"; + String file = "http://" + TestOnLocalServer.server + "fileServer/scanLocal/testData.nc"; try { try (HTTPMethod m = HTTPFactory.Get(file)) { m.setRange(0, 9); @@ -147,7 +147,7 @@ public void testByteRange() { * This test uses a single HTTPSession. */ - static String CLOSEFILE = "http://" + TestDir.remoteTestServer + "/thredds/fileServer/scanLocal/testData.nc"; + static String CLOSEFILE = "http://" + TestOnLocalServer.server + "fileServer/scanLocal/testData.nc"; // "http://rdavm.ucar.edu:8443/thredds/admin/collection/trigger?trigger=never&collection=ds083.2_Grib1"; @Test diff --git a/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java b/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java index 83ba220e9e..f56db34be3 100644 --- a/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java +++ b/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java @@ -17,10 +17,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import thredds.test.util.TdsUnitTestCommon; +import thredds.test.util.TestOnLocalServer; import ucar.httpservices.HTTPFactory; import ucar.httpservices.HTTPMethod; import ucar.httpservices.HTTPSession; -import ucar.unidata.util.test.TestDir; import ucar.unidata.util.test.category.NotPullRequest; import java.io.IOException; @@ -148,7 +148,7 @@ public TestTomcatAuth() { setTitle("Authorization tests"); // HTTPSession.debugHeaders(true); HTTPSession.TESTING = true; - this.server = TestDir.remoteTestServer; + this.server = TestOnLocalServer.server; defineTestCases(); } @@ -214,7 +214,7 @@ public String inline() throws Exception { protected List basictests = new ArrayList<>(); protected void defineTestCases() { - basictests.add(new AuthDataBasic("http://" + this.server + "/thredds/dodsC/containerauth/testData2.nc.dds", "tds", + basictests.add(new AuthDataBasic("http://" + this.server + "dodsC/containerauth/testData2.nc.dds", "tds", "secret666")); } From 092c18e80953246ea63f588d70c2def1d0f8aa94 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Fri, 5 Apr 2024 10:52:23 -0600 Subject: [PATCH 2/4] Replace remotetest server constant with TestOnLocalServer constant --- .../java/thredds/test/util/TdsTestDir.java | 15 --------------- .../thredds/test/util/TdsUnitTestCommon.java | 4 ---- .../java/ucar/nc2/dt/fmrc/TestUgridFmrc.java | 19 +++++++++---------- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 tds-test-utils/src/main/java/thredds/test/util/TdsTestDir.java diff --git a/tds-test-utils/src/main/java/thredds/test/util/TdsTestDir.java b/tds-test-utils/src/main/java/thredds/test/util/TdsTestDir.java deleted file mode 100644 index dd154c508e..0000000000 --- a/tds-test-utils/src/main/java/thredds/test/util/TdsTestDir.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2021 University Corporation for Atmospheric Research/Unidata - * See LICENSE for license information. - */ - -package thredds.test.util; - -public class TdsTestDir { - - // Remote Test server(s) - public static String remoteTestServer = "localhost:8081"; - - public static String dap4TestServerPropName = "d4ts"; - public static String dap4TestServer = "localhost:8083"; -} diff --git a/tds-test-utils/src/main/java/thredds/test/util/TdsUnitTestCommon.java b/tds-test-utils/src/main/java/thredds/test/util/TdsUnitTestCommon.java index 56df6f0a92..fb8a6323ad 100644 --- a/tds-test-utils/src/main/java/thredds/test/util/TdsUnitTestCommon.java +++ b/tds-test-utils/src/main/java/thredds/test/util/TdsUnitTestCommon.java @@ -44,15 +44,11 @@ public abstract class TdsUnitTestCommon { static final Set ENHANCEMENT = EnumSet.of(NetcdfDataset.Enhance.CoordSystems); protected static String threddsroot = null; - protected static String threddsServer = null; static { // Compute the root path threddsroot = locateThreddsRoot(); assert threddsroot != null : "Cannot locate /thredds parent dir"; - threddsServer = TdsTestDir.remoteTestServer; - if (DEBUG) - System.err.println("TdsUnitTestCommon: threddsServer=" + threddsServer); } ////////////////////////////////////////////////// diff --git a/tds/src/integrationTests/java/ucar/nc2/dt/fmrc/TestUgridFmrc.java b/tds/src/integrationTests/java/ucar/nc2/dt/fmrc/TestUgridFmrc.java index 65d9631b71..4ae69dfc9b 100644 --- a/tds/src/integrationTests/java/ucar/nc2/dt/fmrc/TestUgridFmrc.java +++ b/tds/src/integrationTests/java/ucar/nc2/dt/fmrc/TestUgridFmrc.java @@ -13,7 +13,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -import thredds.test.util.TdsTestDir; +import thredds.test.util.TestOnLocalServer; import ucar.ma2.Array; import ucar.ma2.DataType; import ucar.ma2.InvalidRangeException; @@ -49,8 +49,8 @@ public static void openIndividualFiles() { @Test @Category(NeedsCdmUnitTest.class) public void test2DFmrc() throws IOException, InvalidRangeException { - final String urlPath2d = "/thredds/cdmremote/testUsfWsfUgridFmrc/USF_WSF_nc_fmrc.ncd"; - final String tdsLocation = "cdmremote:http://" + TdsTestDir.remoteTestServer + urlPath2d; + final String urlPath2d = "cdmremote/testUsfWsfUgridFmrc/USF_WSF_nc_fmrc.ncd"; + final String tdsLocation = "cdmremote:http://" + TestOnLocalServer.server + urlPath2d; String testVariableName = "salinity"; String singleRuntimeSection = ":,2,10:10000:100"; try (NetcdfFile fmrc2d = NetcdfDatasets.openFile(tdsLocation, null)) { @@ -80,8 +80,8 @@ public void test2DFmrc() throws IOException, InvalidRangeException { @Category(NeedsCdmUnitTest.class) public void testCFOFmrc() throws IOException, InvalidRangeException { // 8 hour offset into a collection of runs that output hourly - final String urlPathCfo = "/thredds/cdmremote/testUsfWsfUgridFmrc/offset/USF_WSF_nc_Offset_8.0hr"; - final String tdsLocation = "cdmremote:http://" + TdsTestDir.remoteTestServer + urlPathCfo; + final String urlPathCfo = "cdmremote/testUsfWsfUgridFmrc/offset/USF_WSF_nc_Offset_8.0hr"; + final String tdsLocation = "cdmremote:http://" + TestOnLocalServer.server + urlPathCfo; String testVariableName = "salinity"; String singleSpatialSection = "2,10:10000:100"; // index 8 => forecast hour 8 since index 0 is forecast hour 0 @@ -113,9 +113,8 @@ public void testCFOFmrc() throws IOException, InvalidRangeException { @Category(NeedsCdmUnitTest.class) public void testCFTFmrc() throws IOException, InvalidRangeException { // 8 hour offset into a collection of runs that output hourly - final String urlPathCft = - "/thredds/cdmremote/testUsfWsfUgridFmrc/forecast/USF_WSF_nc_ConstantForecast_2019-01-28T03:00:00Z"; - final String tdsLocation = "cdmremote:http://" + TdsTestDir.remoteTestServer + urlPathCft; + final String urlPathCft = "cdmremote/testUsfWsfUgridFmrc/forecast/USF_WSF_nc_ConstantForecast_2019-01-28T03:00:00Z"; + final String tdsLocation = "cdmremote:http://" + TestOnLocalServer.server + urlPathCft; String testVariableName = "salinity"; String singleSpatialSection = "2,10:10000:100"; // Forecast time 2019-01-28T03:00:00Z should be the 4th time index into the second granule of the collection @@ -141,8 +140,8 @@ public void testCFTFmrc() throws IOException, InvalidRangeException { @Category(NeedsCdmUnitTest.class) public void testFMRFmrc() throws IOException, InvalidRangeException { // the 2019-01-28T00:00:00Z Forecast Model Run should be the same as the second granule that makes up collection. - final String urlPathCft = "/thredds/cdmremote/testUsfWsfUgridFmrc/runs/USF_WSF_nc_RUN_2019-01-28T00:00:00Z"; - final String tdsLocation = "cdmremote:http://" + TdsTestDir.remoteTestServer + urlPathCft; + final String urlPathCft = "cdmremote/testUsfWsfUgridFmrc/runs/USF_WSF_nc_RUN_2019-01-28T00:00:00Z"; + final String tdsLocation = "cdmremote:http://" + TestOnLocalServer.server + urlPathCft; String testVariableName = "salinity"; String testSection = ":,2,10:10000:100"; try (NetcdfFile fmrcCfo = NetcdfDatasets.openFile(tdsLocation, null)) { From 0ccf4b9a32f8cdc3ffc25d56ec40d8ce0d89f169 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Fri, 5 Apr 2024 11:44:36 -0600 Subject: [PATCH 3/4] Spotless formatting --- .../java/ucar/nc2/util/net/TestTomcatAuth.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java b/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java index f56db34be3..b45167ab4a 100644 --- a/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java +++ b/tds/src/integrationTests/java/ucar/nc2/util/net/TestTomcatAuth.java @@ -214,8 +214,8 @@ public String inline() throws Exception { protected List basictests = new ArrayList<>(); protected void defineTestCases() { - basictests.add(new AuthDataBasic("http://" + this.server + "dodsC/containerauth/testData2.nc.dds", "tds", - "secret666")); + basictests + .add(new AuthDataBasic("http://" + this.server + "dodsC/containerauth/testData2.nc.dds", "tds", "secret666")); } @Test From b0f433fd72a7b3dcd46d908d3b90fb35b4306707 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Fri, 5 Apr 2024 11:48:50 -0600 Subject: [PATCH 4/4] Remove references to TdsTestDir --- .../java/thredds/server/cdmr/TestCdmRemoteCompareHeadersP.java | 1 - .../java/thredds/server/ncss/TestGridAsPointP.java | 1 - .../java/thredds/server/services/ConsistentDatesTest.java | 1 - .../integrationTests/java/thredds/server/wcs/TestWcsServer.java | 1 - .../server/ncss/controller/grid/AllVariablesSubsettingTest.java | 1 - .../server/ncss/controller/grid/FmrcHorizSubsettingTest.java | 1 - .../server/ncss/controller/grid/SpatialSubsettingTest.java | 1 - .../server/ncss/controller/grid/TemporalSpaceSubsettingTest.java | 1 - .../server/ncss/controller/grid/VariableSpaceSubsettingTest.java | 1 - .../ncss/controller/grid/VerticalStrideSubsettingTest.java | 1 - tds/src/test/java/thredds/server/opendap/TestCEEvaluator.java | 1 - 11 files changed, 11 deletions(-) diff --git a/tds/src/integrationTests/java/thredds/server/cdmr/TestCdmRemoteCompareHeadersP.java b/tds/src/integrationTests/java/thredds/server/cdmr/TestCdmRemoteCompareHeadersP.java index f0d90dd9a4..cdca52f01b 100644 --- a/tds/src/integrationTests/java/thredds/server/cdmr/TestCdmRemoteCompareHeadersP.java +++ b/tds/src/integrationTests/java/thredds/server/cdmr/TestCdmRemoteCompareHeadersP.java @@ -14,7 +14,6 @@ import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import thredds.test.util.TdsTestDir; import thredds.test.util.TestOnLocalServer; import ucar.nc2.Attribute; import ucar.nc2.NetcdfFile; diff --git a/tds/src/integrationTests/java/thredds/server/ncss/TestGridAsPointP.java b/tds/src/integrationTests/java/thredds/server/ncss/TestGridAsPointP.java index cdd177d09f..e4646db78c 100644 --- a/tds/src/integrationTests/java/thredds/server/ncss/TestGridAsPointP.java +++ b/tds/src/integrationTests/java/thredds/server/ncss/TestGridAsPointP.java @@ -22,7 +22,6 @@ import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import thredds.test.util.TdsTestDir; import thredds.test.util.TestOnLocalServer; import thredds.util.ContentType; import ucar.httpservices.HTTPFactory; diff --git a/tds/src/integrationTests/java/thredds/server/services/ConsistentDatesTest.java b/tds/src/integrationTests/java/thredds/server/services/ConsistentDatesTest.java index c2d7110ed3..24e4ec7624 100644 --- a/tds/src/integrationTests/java/thredds/server/services/ConsistentDatesTest.java +++ b/tds/src/integrationTests/java/thredds/server/services/ConsistentDatesTest.java @@ -24,7 +24,6 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import thredds.test.util.TdsTestDir; import thredds.test.util.TestOnLocalServer; import thredds.util.ContentType; import ucar.nc2.Attribute; diff --git a/tds/src/integrationTests/java/thredds/server/wcs/TestWcsServer.java b/tds/src/integrationTests/java/thredds/server/wcs/TestWcsServer.java index 3ec60b61b4..6152dcf9f5 100644 --- a/tds/src/integrationTests/java/thredds/server/wcs/TestWcsServer.java +++ b/tds/src/integrationTests/java/thredds/server/wcs/TestWcsServer.java @@ -20,7 +20,6 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import thredds.test.util.TdsTestDir; import thredds.test.util.TestOnLocalServer; import thredds.util.ContentType; import ucar.nc2.NetcdfFile; diff --git a/tds/src/test/java/thredds/server/ncss/controller/grid/AllVariablesSubsettingTest.java b/tds/src/test/java/thredds/server/ncss/controller/grid/AllVariablesSubsettingTest.java index 01c51347e6..21e82ac4e0 100644 --- a/tds/src/test/java/thredds/server/ncss/controller/grid/AllVariablesSubsettingTest.java +++ b/tds/src/test/java/thredds/server/ncss/controller/grid/AllVariablesSubsettingTest.java @@ -21,7 +21,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import thredds.test.util.TdsTestDir; import thredds.mock.params.GridPathParams; import thredds.mock.web.MockTdsContextLoader; import ucar.nc2.NetcdfFile; diff --git a/tds/src/test/java/thredds/server/ncss/controller/grid/FmrcHorizSubsettingTest.java b/tds/src/test/java/thredds/server/ncss/controller/grid/FmrcHorizSubsettingTest.java index 5cef6c2c4b..9037c8991b 100644 --- a/tds/src/test/java/thredds/server/ncss/controller/grid/FmrcHorizSubsettingTest.java +++ b/tds/src/test/java/thredds/server/ncss/controller/grid/FmrcHorizSubsettingTest.java @@ -21,7 +21,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import thredds.test.util.TdsTestDir; import thredds.junit4.SpringJUnit4ParameterizedClassRunner; import thredds.mock.web.MockTdsContextLoader; import ucar.nc2.NetcdfFile; diff --git a/tds/src/test/java/thredds/server/ncss/controller/grid/SpatialSubsettingTest.java b/tds/src/test/java/thredds/server/ncss/controller/grid/SpatialSubsettingTest.java index e5ab46188d..aa7f576082 100644 --- a/tds/src/test/java/thredds/server/ncss/controller/grid/SpatialSubsettingTest.java +++ b/tds/src/test/java/thredds/server/ncss/controller/grid/SpatialSubsettingTest.java @@ -23,7 +23,6 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import thredds.test.util.TdsTestDir; import thredds.junit4.SpringJUnit4ParameterizedClassRunner; import thredds.junit4.SpringJUnit4ParameterizedClassRunner.Parameters; import thredds.mock.params.GridDataParameters; diff --git a/tds/src/test/java/thredds/server/ncss/controller/grid/TemporalSpaceSubsettingTest.java b/tds/src/test/java/thredds/server/ncss/controller/grid/TemporalSpaceSubsettingTest.java index 8fc6d108f4..a5ad28bd30 100644 --- a/tds/src/test/java/thredds/server/ncss/controller/grid/TemporalSpaceSubsettingTest.java +++ b/tds/src/test/java/thredds/server/ncss/controller/grid/TemporalSpaceSubsettingTest.java @@ -20,7 +20,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import thredds.test.util.TdsTestDir; import thredds.junit4.SpringJUnit4ParameterizedClassRunner; import thredds.junit4.SpringJUnit4ParameterizedClassRunner.Parameters; import thredds.mock.params.GridPathParams; diff --git a/tds/src/test/java/thredds/server/ncss/controller/grid/VariableSpaceSubsettingTest.java b/tds/src/test/java/thredds/server/ncss/controller/grid/VariableSpaceSubsettingTest.java index 413643b375..1a47f2f0d9 100644 --- a/tds/src/test/java/thredds/server/ncss/controller/grid/VariableSpaceSubsettingTest.java +++ b/tds/src/test/java/thredds/server/ncss/controller/grid/VariableSpaceSubsettingTest.java @@ -22,7 +22,6 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import thredds.test.util.TdsTestDir; import thredds.junit4.SpringJUnit4ParameterizedClassRunner; import thredds.junit4.SpringJUnit4ParameterizedClassRunner.Parameters; import thredds.mock.params.GridDataParameters; diff --git a/tds/src/test/java/thredds/server/ncss/controller/grid/VerticalStrideSubsettingTest.java b/tds/src/test/java/thredds/server/ncss/controller/grid/VerticalStrideSubsettingTest.java index a33ac9e0c7..61a3ff4bfd 100644 --- a/tds/src/test/java/thredds/server/ncss/controller/grid/VerticalStrideSubsettingTest.java +++ b/tds/src/test/java/thredds/server/ncss/controller/grid/VerticalStrideSubsettingTest.java @@ -17,7 +17,6 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import thredds.test.util.TdsTestDir; import thredds.junit4.SpringJUnit4ParameterizedClassRunner.Parameters; import thredds.mock.params.GridDataParameters; import thredds.mock.params.GridPathParams; diff --git a/tds/src/test/java/thredds/server/opendap/TestCEEvaluator.java b/tds/src/test/java/thredds/server/opendap/TestCEEvaluator.java index ee9c2a75b9..df4ceb91a9 100644 --- a/tds/src/test/java/thredds/server/opendap/TestCEEvaluator.java +++ b/tds/src/test/java/thredds/server/opendap/TestCEEvaluator.java @@ -14,7 +14,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import thredds.test.util.TdsTestDir; import thredds.test.util.TdsUnitTestCommon; import ucar.nc2.NetcdfFile; import ucar.nc2.dataset.NetcdfDataset;