diff --git a/opendap/src/test/java/ucar/nc2/dods/TestAxisAttrCombiner.java b/opendap/src/test/java/ucar/nc2/dods/TestAxisAttrCombiner.java index 3d210a72d8..b7f3a36d43 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestAxisAttrCombiner.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestAxisAttrCombiner.java @@ -3,16 +3,19 @@ */ package ucar.nc2.dods; -import junit.framework.TestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.nc2.Attribute; import ucar.nc2.constants._Coordinate; import java.lang.invoke.MethodHandles; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static ucar.nc2.dods.DODSNetcdfFile.combineAxesAttrs; -public class TestAxisAttrCombiner extends TestCase { +public class TestAxisAttrCombiner { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @Test @@ -47,6 +50,7 @@ public void testAxisAttrCombineOverlap() { assertEquals(attr3.getStringValue().split("\\s").length, 6); } + @Test public void testAxisAttrCombineOverlapMangled() { Attribute attr1 = new Attribute(_Coordinate.Axes, " abe bec cid dave "); Attribute attr2 = new Attribute(_Coordinate.Axes, "cid dave ed fin"); diff --git a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java index 0ae04f100d..70c65d04ce 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestDODSStructureForSequence.java @@ -5,9 +5,12 @@ // $Id: TestDODSStructureForSequence.java 51 2006-07-12 17:13:13Z caron $ package ucar.nc2.dods; -import junit.framework.TestCase; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.lang.invoke.MethodHandles; +import org.junit.Ignore; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.nc2.Structure; @@ -17,18 +20,11 @@ /** * Test DODS Sequence access using DODSStructure. */ -public class TestDODSStructureForSequence extends TestCase { +public class TestDODSStructureForSequence { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - public TestDODSStructureForSequence(String name) { - super(name); - } - - // suppress "no test failure warning message */ - public void testFake() throws Exception { - assert true; - } - + @Ignore("Server dods.jpl.nasa.gov not found") + @Test 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"; diff --git a/opendap/src/test/java/ucar/nc2/dods/TestSequence.java b/opendap/src/test/java/ucar/nc2/dods/TestSequence.java index d1c597d882..223ad86905 100644 --- a/opendap/src/test/java/ucar/nc2/dods/TestSequence.java +++ b/opendap/src/test/java/ucar/nc2/dods/TestSequence.java @@ -1,6 +1,6 @@ package ucar.nc2.dods; -import junit.framework.TestCase; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ucar.ma2.Array; @@ -10,21 +10,10 @@ import java.lang.invoke.MethodHandles; import ucar.nc2.dataset.NetcdfDatasets; -public class TestSequence extends TestCase { +public class TestSequence { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - final String TITLE = "OpenDAP Sequence Test"; - - public TestSequence(String name, String testdir) { - super(name); - } - - public TestSequence(String name) { - super(name); - } - - static String baseline = ""; - + @Test public void testSequence() { // The old url: "http://tsds.net/tsds/test/Scalar" is no longer valid. // So replaced with an equivalent.