From 648d24c66299cefdcf16dcaa682853f7b0d065e2 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Tue, 10 Aug 2021 19:12:45 +0200 Subject: [PATCH] refactored import statements to use org.junit.Assert instead of deprecated methods in junit.framework.Assert. Upgrades to junit 4.13.2 --- .../validation/GmlGeometryValidatorTest.java | 4 +- .../validation/GeometryValidatorTest.java | 2 +- .../geometry/wkbadapter/WKBReaderTest.java | 2 +- .../org/deegree/gml/VersionFromMimeTest.java | 2 +- .../dictionary/GMLDictionaryReaderTest.java | 2 +- .../geometry/GML3CurveSegmentReaderTest.java | 236 +++++++++--------- .../geometry/GML3SurfacePatchReaderTest.java | 10 +- .../gml/schema/GMLAppSchemaWriterTest.java | 2 +- .../deegree/junit/XMLMemoryStreamWriter.java | 2 +- .../tom/datetime/ISO8601ConverterTest.java | 6 +- .../utils/io/StreamBufferStoreTest.java | 2 +- .../deegree/commons/xml/XMLAdapterTest.java | 3 +- .../deegree/commons/xml/XPathUtilsTest.java | 2 +- .../commons/xml/stax/XMLStreamUtilsTest.java | 2 +- .../coverage/filter/RasterRangeSetTest.java | 2 +- .../deegree/coverage/raster/GeoTIFFTest.java | 4 +- .../coverage/raster/RasterFactoryTest.java | 4 +- .../raster/cache/TestRasterCache.java | 2 +- .../raster/geom/RasterGeoRefTest.java | 12 +- .../coverage/raster/geom/RasterRectTest.java | 2 +- .../raster/integration/CacheFileTest.java | 2 +- .../raster/integration/CenterOuterTest.java | 4 +- .../integration/GriddedTileContainerTest.java | 2 +- .../raster/integration/SimpleRasterTest.java | 2 +- .../raster/integration/TiledRasterTest.java | 2 +- .../ProviderBasedAccuracyTest.java | 6 +- .../cs/configuration/wkt/WKTParserTest.java | 18 +- .../cs/coordinatesystems/AxisOrderTest.java | 38 +-- .../DomainOfValidityTest.java | 2 +- .../TransformationAccuracy.java | 4 +- .../TransformationAccuracyTest.java | 2 +- .../TransformationSubstitutionTest.java | 2 +- .../parsing/FeatureInfoParserTest.java | 2 +- .../templating/Templating2ParserTest.java | 2 +- .../geometry/GeometryAnalysisTest.java | 4 +- .../java/org/deegree/geometry/QTreeTest.java | 2 +- .../org/deegree/geometry/SFSProfilerTest.java | 86 +++---- .../ows/http/OwsHttpResponseTest.java | 2 +- .../getrecords/GetRecordsResponseTest.java | 2 +- .../protocol/wfs/client/WFSClientTest.java | 2 +- .../wfs/client/WFSFeatureCollectionTest.java | 4 +- .../DescribeFeatureTypeXMLAdapterTest.java | 2 +- .../xml/GetFeatureWithLockXMLAdapterTest.java | 4 +- .../kvp/GetPropertyValueKVPAdapterTest.java | 2 +- .../xml/GetPropertyValueXMLAdapterTest.java | 6 +- .../xml/LockFeatureXMLAdapterTest.java | 4 +- .../client/WMTSCapabilitiesAdapterTest.java | 2 +- .../ebrim/eo/RecordSerializeTest.java | 2 +- .../ebrim/eo/io/EbrimEOAdapterTest.java | 8 +- ...ISOMemoryMetadataStoreTransactionTest.java | 2 +- .../memory/ListMetadataResultSetTest.java | 8 +- .../memory/StoredISORecordsTest.java | 8 +- .../layout/TileCacheDiskLayoutTest.java | 2 +- .../controller/RequestContextTest.java | 2 +- .../theme/XMLMemoryStreamWriter.java | 2 +- pom.xml | 2 +- .../protocol/wps/TestVectorLayerAdapter.java | 2 +- 57 files changed, 275 insertions(+), 276 deletions(-) diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/gml/validation/GmlGeometryValidatorTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/gml/validation/GmlGeometryValidatorTest.java index 9917c74e91..5808ff59b7 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/gml/validation/GmlGeometryValidatorTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/gml/validation/GmlGeometryValidatorTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.geometry.gml.validation; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.gml.GMLVersion.GML_31; import java.io.IOException; @@ -46,7 +46,7 @@ import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLStreamException; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.cs.exceptions.UnknownCRSException; import org.deegree.geometry.validation.event.CurveDiscontinuity; diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/validation/GeometryValidatorTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/validation/GeometryValidatorTest.java index 47e962f259..e14eeb9d2c 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/validation/GeometryValidatorTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/validation/GeometryValidatorTest.java @@ -46,7 +46,7 @@ import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLStreamException; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.xml.XMLParsingException; import org.deegree.cs.coordinatesystems.ICRS; diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/wkbadapter/WKBReaderTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/wkbadapter/WKBReaderTest.java index 8e6d038356..e9a365749c 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/wkbadapter/WKBReaderTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/geometry/wkbadapter/WKBReaderTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.geometry.wkbadapter; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import java.io.InputStream; import java.io.StringWriter; diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/VersionFromMimeTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/VersionFromMimeTest.java index d53bedaa1d..867df2d6b2 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/VersionFromMimeTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/VersionFromMimeTest.java @@ -38,7 +38,7 @@ package org.deegree.gml; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.gml.GMLVersion.fromMimeType; import org.junit.Test; diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/dictionary/GMLDictionaryReaderTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/dictionary/GMLDictionaryReaderTest.java index 4732e9eae5..d7987b65ff 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/dictionary/GMLDictionaryReaderTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/dictionary/GMLDictionaryReaderTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.gml.dictionary; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.gml.GMLVersion.GML_30; import java.io.IOException; diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3CurveSegmentReaderTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3CurveSegmentReaderTest.java index bc335fb2ff..1d81dc8b1b 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3CurveSegmentReaderTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3CurveSegmentReaderTest.java @@ -41,7 +41,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.xml.XMLParsingException; import org.deegree.commons.xml.stax.XMLStreamReaderWrapper; @@ -94,12 +94,12 @@ public void parseArc() Arc arc = (Arc) getParser().parseCurveSegment( getReader( "Arc.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 1, arc.getNumArcs() ); Assert.assertEquals( 3, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getPoint1().get0() ); - Assert.assertEquals( 0.0, arc.getPoint1().get1() ); - Assert.assertEquals( 0.0, arc.getPoint2().get0() ); - Assert.assertEquals( 2.0, arc.getPoint2().get1() ); - Assert.assertEquals( -2.0, arc.getPoint3().get0() ); - Assert.assertEquals( 0.0, arc.getPoint3().get1() ); + Assert.assertEquals( 2.0, arc.getPoint1().get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getPoint1().get1(), 0.01d ); + Assert.assertEquals( 0.0, arc.getPoint2().get0(), 0.01d ); + Assert.assertEquals( 2.0, arc.getPoint2().get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getPoint3().get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getPoint3().get1(), 0.01d ); } @Test @@ -110,16 +110,16 @@ public void parseArcByBulge() CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 1, arc.getNumArcs() ); Assert.assertEquals( 2, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getPoint1().get0() ); - Assert.assertEquals( 0.0, arc.getPoint1().get1() ); - Assert.assertEquals( -2.0, arc.getPoint2().get0() ); - Assert.assertEquals( 0.0, arc.getPoint2().get1() ); + Assert.assertEquals( 2.0, arc.getPoint1().get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getPoint1().get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getPoint2().get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getPoint2().get1(), 0.01d ); Assert.assertEquals( 1, arc.getBulges().length ); - Assert.assertEquals( 2.0, arc.getBulge() ); + Assert.assertEquals( 2.0, arc.getBulge(), 0.01d ); Assert.assertEquals( 1, arc.getNormals().size() ); // Assert.assertEquals( 1, arc.getNormal().getCoordinateDimension() ); TODO Since every point we're working with // has 2 or 3 coords, find a way around this gml:vectortype - Assert.assertEquals( -1.0, arc.getNormal().get0() ); + Assert.assertEquals( -1.0, arc.getNormal().get0(), 0.01d ); } @Test @@ -129,13 +129,13 @@ public void parseArcByCenterPoint() ArcByCenterPoint arc = (ArcByCenterPoint) getParser().parseCurveSegment( getReader( "ArcByCenterPoint.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 2, arc.getMidPoint().getCoordinateDimension() ); - Assert.assertEquals( 47.0, arc.getMidPoint().get0() ); - Assert.assertEquals( 11.0, arc.getMidPoint().get1() ); - Assert.assertEquals( 1.0, arc.getRadius( null ).getValueAsDouble() ); + Assert.assertEquals( 47.0, arc.getMidPoint().get0(), 0.01d ); + Assert.assertEquals( 11.0, arc.getMidPoint().get1(), 0.01d ); + Assert.assertEquals( 1.0, arc.getRadius( null ).getValueAsDouble(), 0.01d ); Assert.assertEquals( "whatever#metres", arc.getRadius( null ).getUomUri() ); - Assert.assertEquals( 180.0, arc.getStartAngle().getValueAsDouble() ); + Assert.assertEquals( 180.0, arc.getStartAngle().getValueAsDouble(), 0.01d ); Assert.assertEquals( "whatever#degrees", arc.getStartAngle().getUomUri() ); - Assert.assertEquals( 360.0, arc.getEndAngle().getValueAsDouble() ); + Assert.assertEquals( 360.0, arc.getEndAngle().getValueAsDouble(), 0.01d ); Assert.assertEquals( "whatever#degrees", arc.getEndAngle().getUomUri() ); } @@ -146,20 +146,20 @@ public void parseArcString() ArcString arc = (ArcString) getParser().parseCurveSegment( getReader( "ArcString.gml" ), null ); Assert.assertEquals( 3, arc.getNumArcs() ); Assert.assertEquals( 7, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -2.0, arc.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 2 ).get1() ); - Assert.assertEquals( -4.0, arc.getControlPoints().get( 3 ).get0() ); - Assert.assertEquals( -2.0, arc.getControlPoints().get( 3 ).get1() ); - Assert.assertEquals( -6.0, arc.getControlPoints().get( 4 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 4 ).get1() ); - Assert.assertEquals( -8.0, arc.getControlPoints().get( 5 ).get0() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 5 ).get1() ); - Assert.assertEquals( -10.0, arc.getControlPoints().get( 6 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 6 ).get1() ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 2 ).get1(), 0.01d ); + Assert.assertEquals( -4.0, arc.getControlPoints().get( 3 ).get0(), 0.01d ); + Assert.assertEquals( -2.0, arc.getControlPoints().get( 3 ).get1(), 0.01d ); + Assert.assertEquals( -6.0, arc.getControlPoints().get( 4 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 4 ).get1(), 0.01d ); + Assert.assertEquals( -8.0, arc.getControlPoints().get( 5 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 5 ).get1(), 0.01d ); + Assert.assertEquals( -10.0, arc.getControlPoints().get( 6 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 6 ).get1(), 0.01d ); } @Test @@ -170,14 +170,14 @@ public void parseArcStringByBulge() CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 3, arc.getNumArcs() ); Assert.assertEquals( 4, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( -2.0, arc.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -4.0, arc.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 2 ).get1() ); - Assert.assertEquals( -6.0, arc.getControlPoints().get( 3 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 3 ).get1() ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -4.0, arc.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 2 ).get1(), 0.01d ); + Assert.assertEquals( -6.0, arc.getControlPoints().get( 3 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 3 ).get1(), 0.01d ); } @Test @@ -187,22 +187,22 @@ public void parseBezier() Bezier arc = (Bezier) getParser().parseCurveSegment( getReader( "Bezier.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 4, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 1.0, arc.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( -2.0, arc.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -4.0, arc.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 3.0, arc.getControlPoints().get( 2 ).get1() ); - Assert.assertEquals( -6.0, arc.getControlPoints().get( 3 ).get0() ); - Assert.assertEquals( 4.0, arc.getControlPoints().get( 3 ).get1() ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 1.0, arc.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -4.0, arc.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 3.0, arc.getControlPoints().get( 2 ).get1(), 0.01d ); + Assert.assertEquals( -6.0, arc.getControlPoints().get( 3 ).get0(), 0.01d ); + Assert.assertEquals( 4.0, arc.getControlPoints().get( 3 ).get1(), 0.01d ); Assert.assertEquals( 4, arc.getPolynomialDegree() ); Assert.assertEquals( 2, arc.getKnots().size() ); - Assert.assertEquals( 1.0, arc.getKnot1().getValue() ); + Assert.assertEquals( 1.0, arc.getKnot1().getValue(), 0.01d ); Assert.assertEquals( 4, arc.getKnot1().getMultiplicity() ); - Assert.assertEquals( 5.0, arc.getKnot1().getWeight() ); - Assert.assertEquals( 2.0, arc.getKnot2().getValue() ); + Assert.assertEquals( 5.0, arc.getKnot1().getWeight(), 0.01d ); + Assert.assertEquals( 2.0, arc.getKnot2().getValue(), 0.01d ); Assert.assertEquals( 5, arc.getKnot2().getMultiplicity() ); - Assert.assertEquals( 1.0, arc.getKnot2().getWeight() ); + Assert.assertEquals( 1.0, arc.getKnot2().getWeight(), 0.01d ); } @Test @@ -212,22 +212,22 @@ public void parseBSpline() BSpline arc = (BSpline) getParser().parseCurveSegment( getReader( "BSpline.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 4, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 1.0, arc.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( -2.0, arc.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -4.0, arc.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 3.0, arc.getControlPoints().get( 2 ).get1() ); - Assert.assertEquals( -6.0, arc.getControlPoints().get( 3 ).get0() ); - Assert.assertEquals( 4.0, arc.getControlPoints().get( 3 ).get1() ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 1.0, arc.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -4.0, arc.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 3.0, arc.getControlPoints().get( 2 ).get1(), 0.01d ); + Assert.assertEquals( -6.0, arc.getControlPoints().get( 3 ).get0(), 0.01d ); + Assert.assertEquals( 4.0, arc.getControlPoints().get( 3 ).get1(), 0.01d ); Assert.assertEquals( 4, arc.getPolynomialDegree() ); Assert.assertEquals( 2, arc.getKnots().size() ); - Assert.assertEquals( 1.0, arc.getKnots().get( 0 ).getValue() ); - Assert.assertEquals( 4, arc.getKnots().get( 0 ).getMultiplicity() ); - Assert.assertEquals( 5.0, arc.getKnots().get( 0 ).getWeight() ); - Assert.assertEquals( 2.0, arc.getKnots().get( 1 ).getValue() ); - Assert.assertEquals( 5, arc.getKnots().get( 1 ).getMultiplicity() ); - Assert.assertEquals( 1.0, arc.getKnots().get( 1 ).getWeight() ); + Assert.assertEquals( 1.0, arc.getKnots().get( 0 ).getValue(), 0.01d ); + Assert.assertEquals( 4, arc.getKnots().get( 0 ).getMultiplicity(), 0.01d ); + Assert.assertEquals( 5.0, arc.getKnots().get( 0 ).getWeight(), 0.01d ); + Assert.assertEquals( 2.0, arc.getKnots().get( 1 ).getValue(), 0.01d ); + Assert.assertEquals( 5, arc.getKnots().get( 1 ).getMultiplicity(), 0.01d ); + Assert.assertEquals( 1.0, arc.getKnots().get( 1 ).getWeight(), 0.01d ); } @Test @@ -237,12 +237,12 @@ public void parseCircle() Circle circle = (Circle) getParser().parseCurveSegment( getReader( "Circle.gml" ), null ); Assert.assertEquals( 1, circle.getNumArcs() ); Assert.assertEquals( 3, circle.getControlPoints().size() ); - Assert.assertEquals( 2.0, circle.getPoint1().get0() ); - Assert.assertEquals( 0.0, circle.getPoint1().get1() ); - Assert.assertEquals( 0.0, circle.getPoint2().get0() ); - Assert.assertEquals( 2.0, circle.getPoint2().get1() ); - Assert.assertEquals( -2.0, circle.getPoint3().get0() ); - Assert.assertEquals( 0.0, circle.getPoint3().get1() ); + Assert.assertEquals( 2.0, circle.getPoint1().get0(), 0.01d ); + Assert.assertEquals( 0.0, circle.getPoint1().get1(), 0.01d ); + Assert.assertEquals( 0.0, circle.getPoint2().get0(), 0.01d ); + Assert.assertEquals( 2.0, circle.getPoint2().get1(), 0.01d ); + Assert.assertEquals( -2.0, circle.getPoint3().get0(), 0.01d ); + Assert.assertEquals( 0.0, circle.getPoint3().get1(), 0.01d ); } @Test @@ -252,13 +252,13 @@ public void parseCircleByCenterPoint() ArcByCenterPoint arc = (ArcByCenterPoint) getParser().parseCurveSegment( getReader( "CircleByCenterPoint.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 2, arc.getMidPoint().getCoordinateDimension() ); - Assert.assertEquals( 47.0, arc.getMidPoint().get0() ); - Assert.assertEquals( 11.0, arc.getMidPoint().get1() ); - Assert.assertEquals( 1.0, arc.getRadius( null ).getValueAsDouble() ); + Assert.assertEquals( 47.0, arc.getMidPoint().get0(), 0.01d ); + Assert.assertEquals( 11.0, arc.getMidPoint().get1(), 0.01d ); + Assert.assertEquals( 1.0, arc.getRadius( null ).getValueAsDouble(), 0.01d ); Assert.assertEquals( "whatever#metres", arc.getRadius( null ).getUomUri() ); - Assert.assertEquals( 0.0, arc.getStartAngle().getValueAsDouble() ); + Assert.assertEquals( 0.0, arc.getStartAngle().getValueAsDouble(), 0.01d ); Assert.assertEquals( "whatever#degrees", arc.getStartAngle().getUomUri() ); - Assert.assertEquals( 0.0, arc.getEndAngle().getValueAsDouble() ); + Assert.assertEquals( 0.0, arc.getEndAngle().getValueAsDouble(), 0.01d ); Assert.assertEquals( "whatever#degrees", arc.getEndAngle().getUomUri() ); } @@ -268,21 +268,21 @@ public void parseClothoid() UnknownCRSException { Clothoid segment = (Clothoid) getParser().parseCurveSegment( getReader( "Clothoid.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); - Assert.assertEquals( 47.0, segment.getReferenceLocation().getLocation().get0() ); - Assert.assertEquals( 11.0, segment.getReferenceLocation().getLocation().get1() ); - Assert.assertEquals( 13.0, segment.getReferenceLocation().getLocation().get2() ); + Assert.assertEquals( 47.0, segment.getReferenceLocation().getLocation().get0(), 0.01d ); + Assert.assertEquals( 11.0, segment.getReferenceLocation().getLocation().get1(), 0.01d ); + Assert.assertEquals( 13.0, segment.getReferenceLocation().getLocation().get2(), 0.01d ); Assert.assertEquals( 2, segment.getReferenceLocation().getRefDirections().size() ); - Assert.assertEquals( 3.0, segment.getReferenceLocation().getRefDirections().get( 0 ).get0() ); - Assert.assertEquals( 4.0, segment.getReferenceLocation().getRefDirections().get( 0 ).get1() ); - Assert.assertEquals( 8.0, segment.getReferenceLocation().getRefDirections().get( 0 ).get2() ); - Assert.assertEquals( 5.0, segment.getReferenceLocation().getRefDirections().get( 1 ).get0() ); - Assert.assertEquals( 6.0, segment.getReferenceLocation().getRefDirections().get( 1 ).get1() ); - Assert.assertEquals( 9.0, segment.getReferenceLocation().getRefDirections().get( 1 ).get2() ); + Assert.assertEquals( 3.0, segment.getReferenceLocation().getRefDirections().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 4.0, segment.getReferenceLocation().getRefDirections().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( 8.0, segment.getReferenceLocation().getRefDirections().get( 0 ).get2(), 0.01d ); + Assert.assertEquals( 5.0, segment.getReferenceLocation().getRefDirections().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 6.0, segment.getReferenceLocation().getRefDirections().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( 9.0, segment.getReferenceLocation().getRefDirections().get( 1 ).get2(), 0.01d ); Assert.assertEquals( 2, segment.getReferenceLocation().getInDimension() ); Assert.assertEquals( 3, segment.getReferenceLocation().getOutDimension() ); - Assert.assertEquals( 0.9, segment.getScaleFactor() ); - Assert.assertEquals( -2.5, segment.getStartParameter() ); - Assert.assertEquals( 3.0, segment.getEndParameter() ); + Assert.assertEquals( 0.9, segment.getScaleFactor(), 0.01d ); + Assert.assertEquals( -2.5, segment.getStartParameter(), 0.01d ); + Assert.assertEquals( 3.0, segment.getEndParameter(), 0.01d ); } @Test @@ -292,16 +292,16 @@ public void parseCubicSpline() CubicSpline segment = (CubicSpline) getParser().parseCurveSegment( getReader( "CubicSpline.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); Assert.assertEquals( 3, segment.getControlPoints().size() ); - Assert.assertEquals( -2.0, segment.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( -4.0, segment.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -6.0, segment.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 1.0, segment.getControlPoints().get( 2 ).get1() ); - Assert.assertEquals( 0.0, segment.getVectorAtStart().get0() ); - Assert.assertEquals( -1.0, segment.getVectorAtStart().get1() ); - Assert.assertEquals( -1.0, segment.getVectorAtEnd().get0() ); - Assert.assertEquals( 1.0, segment.getVectorAtEnd().get1() ); + Assert.assertEquals( -2.0, segment.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( -4.0, segment.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -6.0, segment.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 1.0, segment.getControlPoints().get( 2 ).get1(), 0.01d ); + Assert.assertEquals( 0.0, segment.getVectorAtStart().get0(), 0.01d ); + Assert.assertEquals( -1.0, segment.getVectorAtStart().get1(), 0.01d ); + Assert.assertEquals( -1.0, segment.getVectorAtEnd().get0(), 0.01d ); + Assert.assertEquals( 1.0, segment.getVectorAtEnd().get1(), 0.01d ); } @Test @@ -310,10 +310,10 @@ public void parseGeodesic() UnknownCRSException { Geodesic segment = (Geodesic) getParser().parseCurveSegment( getReader( "Geodesic.gml" ), null ); Assert.assertEquals( 2, segment.getControlPoints().size() ); - Assert.assertEquals( 2.0, segment.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 2.0, segment.getControlPoints().get( 1 ).get1() ); + Assert.assertEquals( 2.0, segment.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, segment.getControlPoints().get( 1 ).get1(), 0.01d ); } @Test @@ -323,12 +323,12 @@ public void parseGeodesicString() GeodesicString segment = (GeodesicString) getParser().parseCurveSegment( getReader( "GeodesicString.gml" ), null ); Assert.assertEquals( 3, segment.getControlPoints().size() ); - Assert.assertEquals( 2.0, segment.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 2.0, segment.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -2.0, segment.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 0.0, segment.getControlPoints().get( 2 ).get1() ); + Assert.assertEquals( 2.0, segment.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, segment.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -2.0, segment.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, segment.getControlPoints().get( 2 ).get1(), 0.01d ); } @Test @@ -338,12 +338,12 @@ public void parseLineStringSegment() LineStringSegment arc = (LineStringSegment) getParser().parseCurveSegment( getReader( "LineStringSegment.gml" ), null ); Assert.assertEquals( 3, arc.getControlPoints().size() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 0 ).get1() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 1 ).get0() ); - Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1() ); - Assert.assertEquals( -2.0, arc.getControlPoints().get( 2 ).get0() ); - Assert.assertEquals( 0.0, arc.getControlPoints().get( 2 ).get1() ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 0 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 0 ).get1(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 1 ).get0(), 0.01d ); + Assert.assertEquals( 2.0, arc.getControlPoints().get( 1 ).get1(), 0.01d ); + Assert.assertEquals( -2.0, arc.getControlPoints().get( 2 ).get0(), 0.01d ); + Assert.assertEquals( 0.0, arc.getControlPoints().get( 2 ).get1(), 0.01d ); } @Test @@ -352,9 +352,9 @@ public void parseOffsetCurve() UnknownCRSException { OffsetCurve segment = (OffsetCurve) getParser().parseCurveSegment( getReader( "OffsetCurve.gml" ), CRSManager.getCRSRef( "EPSG:4326" ) ); - Assert.assertEquals( 1.0, segment.getDistance( null ).getValueAsDouble() ); - Assert.assertEquals( 0.0, segment.getDirection().get0() ); - Assert.assertEquals( 1.0, segment.getDirection().get1() ); + Assert.assertEquals( 1.0, segment.getDistance( null ).getValueAsDouble(), 0.01d ); + Assert.assertEquals( 0.0, segment.getDirection().get0(), 0.01d ); + Assert.assertEquals( 1.0, segment.getDirection().get1(), 0.01d ); } private XMLStreamReaderWrapper getReader( String fileName ) diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3SurfacePatchReaderTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3SurfacePatchReaderTest.java index eaf2c60398..6bb165b54a 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3SurfacePatchReaderTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/geometry/GML3SurfacePatchReaderTest.java @@ -41,7 +41,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.xml.XMLParsingException; import org.deegree.commons.xml.stax.XMLStreamReaderWrapper; @@ -76,10 +76,10 @@ public void parsePolygonPatch() XMLStreamReaderWrapper parser = getParser( "PolygonPatch.gml" ); PolygonPatch patch = (PolygonPatch) getPatchParser().parseSurfacePatch( parser, CRSManager.getCRSRef( "EPSG:4326" ) ); - Assert.assertEquals( 2.0, patch.getExteriorRing().getStartPoint().get0() ); - Assert.assertEquals( 0.0, patch.getExteriorRing().getStartPoint().get1() ); - Assert.assertEquals( 2.0, patch.getExteriorRing().getEndPoint().get0() ); - Assert.assertEquals( 0.0, patch.getExteriorRing().getEndPoint().get1() ); + Assert.assertEquals( 2.0, patch.getExteriorRing().getStartPoint().get0(), 0.01d ); + Assert.assertEquals( 0.0, patch.getExteriorRing().getStartPoint().get1(), 0.01d ); + Assert.assertEquals( 2.0, patch.getExteriorRing().getEndPoint().get0(), 0.01d ); + Assert.assertEquals( 0.0, patch.getExteriorRing().getEndPoint().get1(), 0.01d ); Assert.assertEquals( 2, patch.getInteriorRings().size() ); } diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/schema/GMLAppSchemaWriterTest.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/schema/GMLAppSchemaWriterTest.java index 24d6290be6..2adbf8764a 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/schema/GMLAppSchemaWriterTest.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/gml/schema/GMLAppSchemaWriterTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.gml.schema; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSTypeDefinition; import org.deegree.commons.xml.stax.IndentingXMLStreamWriter; diff --git a/deegree-core/deegree-core-base/src/test/java/org/deegree/junit/XMLMemoryStreamWriter.java b/deegree-core/deegree-core-base/src/test/java/org/deegree/junit/XMLMemoryStreamWriter.java index e85e0609d3..4ec0d44f2e 100644 --- a/deegree-core/deegree-core-base/src/test/java/org/deegree/junit/XMLMemoryStreamWriter.java +++ b/deegree-core/deegree-core-base/src/test/java/org/deegree/junit/XMLMemoryStreamWriter.java @@ -45,7 +45,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/tom/datetime/ISO8601ConverterTest.java b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/tom/datetime/ISO8601ConverterTest.java index 66aa58d537..992f8a830e 100644 --- a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/tom/datetime/ISO8601ConverterTest.java +++ b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/tom/datetime/ISO8601ConverterTest.java @@ -42,9 +42,9 @@ import static java.util.Calendar.MONTH; import static java.util.Calendar.SECOND; import static java.util.Calendar.YEAR; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.deegree.commons.tom.datetime.ISO8601Converter.formatDate; import static org.deegree.commons.tom.datetime.ISO8601Converter.formatDateTime; import static org.deegree.commons.tom.datetime.ISO8601Converter.formatDuration; diff --git a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/utils/io/StreamBufferStoreTest.java b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/utils/io/StreamBufferStoreTest.java index 69705634fb..a02f08a4c1 100644 --- a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/utils/io/StreamBufferStoreTest.java +++ b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/utils/io/StreamBufferStoreTest.java @@ -38,7 +38,7 @@ import java.io.IOException; import java.io.InputStream; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XMLAdapterTest.java b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XMLAdapterTest.java index 2ef07e9c10..eced832be5 100644 --- a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XMLAdapterTest.java +++ b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XMLAdapterTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.commons.xml; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -51,7 +51,6 @@ import javax.xml.stream.XMLStreamWriter; import junit.framework.AssertionFailedError; - import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMText; diff --git a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XPathUtilsTest.java b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XPathUtilsTest.java index 5c558052d2..6411f3cc93 100644 --- a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XPathUtilsTest.java +++ b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/XPathUtilsTest.java @@ -37,7 +37,7 @@ import javax.xml.namespace.QName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.junit.Test; diff --git a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/stax/XMLStreamUtilsTest.java b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/stax/XMLStreamUtilsTest.java index b605214720..f63c8d5bd7 100644 --- a/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/stax/XMLStreamUtilsTest.java +++ b/deegree-core/deegree-core-commons/src/test/java/org/deegree/commons/xml/stax/XMLStreamUtilsTest.java @@ -41,7 +41,7 @@ Occam Labs UG (haftungsbeschränkt) package org.deegree.commons.xml.stax; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.net.URL; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/filter/RasterRangeSetTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/filter/RasterRangeSetTest.java index b32d4c79c4..52f003ebb5 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/filter/RasterRangeSetTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/filter/RasterRangeSetTest.java @@ -48,7 +48,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.coverage.filter.raster.RasterFilter; import org.deegree.coverage.rangeset.AxisSubset; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/GeoTIFFTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/GeoTIFFTest.java index 04a5d86e79..55a35a4fed 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/GeoTIFFTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/GeoTIFFTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.coverage.raster; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -43,7 +43,7 @@ import java.io.IOException; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.coverage.raster.geom.RasterGeoReference; import org.deegree.coverage.raster.geom.RasterGeoReference.OriginLocation; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/RasterFactoryTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/RasterFactoryTest.java index cd3f2d5294..82984956f5 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/RasterFactoryTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/RasterFactoryTest.java @@ -60,7 +60,7 @@ import javax.media.jai.ParameterBlockJAI; import javax.media.jai.RenderedOp; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.utils.FileUtils; import org.deegree.coverage.raster.data.info.BandType; @@ -121,7 +121,7 @@ public void testFloatRaster() converter.putInt( 0, val ); float realVal = converter.getFloat( 0 ); float compareVal = pird.getFloatSample( bx, by, 0 ); - Assert.assertEquals( compareVal, realVal ); + Assert.assertEquals( compareVal, realVal, 0.01d ); } } } diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/cache/TestRasterCache.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/cache/TestRasterCache.java index 525d87a750..5c759b83eb 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/cache/TestRasterCache.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/cache/TestRasterCache.java @@ -46,7 +46,7 @@ import java.util.Map; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.utils.FileUtils; import org.deegree.coverage.raster.AbstractRaster; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterGeoRefTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterGeoRefTest.java index 45c8b73394..8668d6a2f1 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterGeoRefTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterGeoRefTest.java @@ -38,10 +38,10 @@ package org.deegree.coverage.raster.geom; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.coverage.raster.geom.RasterGeoReference.OriginLocation.CENTER; import static org.deegree.coverage.raster.geom.RasterGeoReference.OriginLocation.OUTER; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.coverage.raster.geom.RasterGeoReference.OriginLocation; import org.deegree.cs.coordinatesystems.ICRS; @@ -88,12 +88,12 @@ public class RasterGeoRefTest { @Test public void relocatedOrigin() { double[] origin = REF_CENTER.getOrigin( OUTER ); - Assert.assertEquals( 995., origin[0] ); - Assert.assertEquals( 1005., origin[1] ); + Assert.assertEquals( 995., origin[0], 0.01d ); + Assert.assertEquals( 1005., origin[1], 0.01d ); origin = REF_OUTER.getOrigin( CENTER ); - Assert.assertEquals( 1005., origin[0] ); - Assert.assertEquals( 995., origin[1] ); + Assert.assertEquals( 1005., origin[0], 0.01d ); + Assert.assertEquals( 995., origin[1], 0.01d ); } /** diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterRectTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterRectTest.java index 2701161b08..db0cd2ca41 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterRectTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/geom/RasterRectTest.java @@ -38,7 +38,7 @@ package org.deegree.coverage.raster.geom; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CacheFileTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CacheFileTest.java index 1c24ab70d4..20e55de918 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CacheFileTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CacheFileTest.java @@ -47,7 +47,7 @@ import java.math.BigInteger; import java.net.URISyntaxException; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.utils.FileUtils; import org.deegree.coverage.raster.AbstractRaster; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CenterOuterTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CenterOuterTest.java index 167c34cd94..06a0706901 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CenterOuterTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/CenterOuterTest.java @@ -38,7 +38,7 @@ package org.deegree.coverage.raster.integration; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; import static org.slf4j.LoggerFactory.getLogger; import java.awt.image.BufferedImage; @@ -48,7 +48,7 @@ import java.math.BigInteger; import java.net.URISyntaxException; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.utils.PixelCounter; import org.deegree.coverage.raster.SimpleRaster; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/GriddedTileContainerTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/GriddedTileContainerTest.java index e80d23c17c..fbdd9fe662 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/GriddedTileContainerTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/GriddedTileContainerTest.java @@ -43,7 +43,7 @@ import java.net.URISyntaxException; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.coverage.raster.AbstractRaster; import org.deegree.coverage.raster.SimpleRaster; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/SimpleRasterTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/SimpleRasterTest.java index d4e3ff2c9e..bb46cbdc16 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/SimpleRasterTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/SimpleRasterTest.java @@ -44,7 +44,7 @@ import java.io.IOException; import java.io.InputStream; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.coverage.raster.AbstractRaster; import org.deegree.coverage.raster.SimpleRaster; diff --git a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/TiledRasterTest.java b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/TiledRasterTest.java index e68abb3f59..f0b1d83bed 100644 --- a/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/TiledRasterTest.java +++ b/deegree-core/deegree-core-coverage/src/test/java/org/deegree/coverage/raster/integration/TiledRasterTest.java @@ -44,7 +44,7 @@ import java.io.IOException; import java.io.InputStream; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.coverage.raster.AbstractRaster; import org.deegree.coverage.raster.SimpleRaster; diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/ProviderBasedAccuracyTest.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/ProviderBasedAccuracyTest.java index 27d3216fc2..1cd382cb15 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/ProviderBasedAccuracyTest.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/ProviderBasedAccuracyTest.java @@ -36,9 +36,9 @@ package org.deegree.cs.configuration; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collection; diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/wkt/WKTParserTest.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/wkt/WKTParserTest.java index 5956efe643..6e2cb8fd81 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/wkt/WKTParserTest.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/configuration/wkt/WKTParserTest.java @@ -46,7 +46,7 @@ import java.io.IOException; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.cs.components.GeodeticDatum; import org.deegree.cs.components.IDatum; @@ -140,25 +140,25 @@ public void testProjectedCS() IEllipsoid ellipsoid = ( (GeodeticDatum) datum ).getEllipsoid(); Assert.assertEquals( ellipsoidName, ellipsoid.getName() ); Assert.assertEquals( ellipsoidName + ":" + ellipsoidCode, ellipsoid.getCode().getOriginal() ); - Assert.assertEquals( semiMajorAxis, ellipsoid.getSemiMajorAxis() ); - Assert.assertEquals( inverseFlattening, ellipsoid.getInverseFlattening() ); + Assert.assertEquals( semiMajorAxis, ellipsoid.getSemiMajorAxis(), 0.01d ); + Assert.assertEquals( inverseFlattening, ellipsoid.getInverseFlattening(), 0.01d ); IPrimeMeridian pm = ( (GeodeticDatum) datum ).getPrimeMeridian(); Assert.assertEquals( pmName, pm.getName() ); Assert.assertEquals( pmName + ":" + pmCode, pm.getCode().getOriginal() ); Assert.assertEquals( Unit.DEGREE, pm.getAngularUnit() ); - Assert.assertEquals( pmLongitude, pm.getLongitude() ); + Assert.assertEquals( pmLongitude, pm.getLongitude(), 0.01d ); IProjection proj = projCRS.getProjection(); Assert.assertTrue( proj instanceof LambertConformalConic ); LambertConformalConic lcc = (LambertConformalConic) proj; - Assert.assertEquals( falseEasting, lcc.getFalseEasting() ); - Assert.assertEquals( falseNorthing, lcc.getFalseNorthing() ); + Assert.assertEquals( falseEasting, lcc.getFalseEasting(), 0.01d ); + Assert.assertEquals( falseNorthing, lcc.getFalseNorthing(), 0.01d ); Assert.assertEquals( DTR * stdParallel1, lcc.getFirstParallelLatitude(), 1e-12 ); Assert.assertEquals( DTR * stdParallel2, lcc.getSecondParallelLatitude(), 1e-12 ); - Assert.assertEquals( DTR * lonNatOrigin, lcc.getNaturalOrigin().x ); - Assert.assertEquals( DTR * latNatOrigin, lcc.getNaturalOrigin().y ); - Assert.assertEquals( scaleFactor, lcc.getScale() ); + Assert.assertEquals( DTR * lonNatOrigin, lcc.getNaturalOrigin().x, 0.01d ); + Assert.assertEquals( DTR * latNatOrigin, lcc.getNaturalOrigin().y, 0.01d ); + Assert.assertEquals( scaleFactor, lcc.getScale(), 0.01d ); } private String buildPROJCS( String name, String code, String unitName, double unitConversion ) { diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/AxisOrderTest.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/AxisOrderTest.java index 5697689c4e..621d03f1be 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/AxisOrderTest.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/AxisOrderTest.java @@ -35,9 +35,9 @@ ----------------------------------------------------------------------------*/ package org.deegree.cs.coordinatesystems; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; @@ -98,9 +98,9 @@ public void testWGS84DefToDef() assertNotNull( transformedPoints ); assertEquals( 1, transformedPoints.size() ); - assertEquals( 46.074, transformedPoints.get( 0 ).x ); - assertEquals( 9.799, transformedPoints.get( 0 ).y ); - assertEquals( Double.NaN, transformedPoints.get( 0 ).z ); + assertEquals( 46.074, transformedPoints.get( 0 ).x, 0.01d ); + assertEquals( 9.799, transformedPoints.get( 0 ).y, 0.01d ); + assertEquals( Double.NaN, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -115,9 +115,9 @@ public void testWGS84XYToDef() assertNotNull( transformedPoints ); assertEquals( 1, transformedPoints.size() ); - assertEquals( 46.074, transformedPoints.get( 0 ).x ); - assertEquals( 9.799, transformedPoints.get( 0 ).y ); - assertEquals( Double.NaN, transformedPoints.get( 0 ).z ); + assertEquals( 46.074, transformedPoints.get( 0 ).x, 0.01d ); + assertEquals( 9.799, transformedPoints.get( 0 ).y, 0.01d ); + assertEquals( Double.NaN, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -132,9 +132,9 @@ public void testWGS84XYToXY() assertNotNull( transformedPoints ); assertEquals( 1, transformedPoints.size() ); - assertEquals( 9.799, transformedPoints.get( 0 ).x ); - assertEquals( 46.074, transformedPoints.get( 0 ).y ); - assertEquals( Double.NaN, transformedPoints.get( 0 ).z ); + assertEquals( 9.799, transformedPoints.get( 0 ).x, 0.01d ); + assertEquals( 46.074, transformedPoints.get( 0 ).y, 0.01d ); + assertEquals( Double.NaN, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -149,9 +149,9 @@ public void testWGS84DefToXY() assertNotNull( transformedPoints ); assertEquals( 1, transformedPoints.size() ); - assertEquals( 9.799, transformedPoints.get( 0 ).x ); - assertEquals( 46.074, transformedPoints.get( 0 ).y ); - assertEquals( Double.NaN, transformedPoints.get( 0 ).z ); + assertEquals( 9.799, transformedPoints.get( 0 ).x, 0.01d ); + assertEquals( 46.074, transformedPoints.get( 0 ).y, 0.01d ); + assertEquals( Double.NaN, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -169,7 +169,7 @@ public void testTransformDefToDef() assertEquals( 1, transformedPoints.size() ); assertTrue( 3532465.55 < transformedPoints.get( 0 ).x && 3532465.6 > transformedPoints.get( 0 ).x ); assertTrue( 5301523.45 < transformedPoints.get( 0 ).y && 5301523.55 > transformedPoints.get( 0 ).y ); - assertEquals( Double.NaN, transformedPoints.get( 0 ).z ); + assertEquals( Double.NaN, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -186,7 +186,7 @@ public void testTransformDefToDefInverse() assertEquals( 1, transformedPoints.size() ); assertTrue( 47.825 < transformedPoints.get( 0 ).x && 47.875 > transformedPoints.get( 0 ).x ); assertTrue( 9.4 < transformedPoints.get( 0 ).y && 9.45 > transformedPoints.get( 0 ).y ); - assertEquals( 817.0, transformedPoints.get( 0 ).z ); + assertEquals( 817.0, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -203,7 +203,7 @@ public void testTransformXYToDef() assertEquals( 1, transformedPoints.size() ); assertTrue( 3532465.55 < transformedPoints.get( 0 ).x && 3532465.6 > transformedPoints.get( 0 ).x ); assertTrue( 5301523.45 < transformedPoints.get( 0 ).y && 5301523.55 > transformedPoints.get( 0 ).y ); - assertEquals( Double.NaN, transformedPoints.get( 0 ).z ); + assertEquals( Double.NaN, transformedPoints.get( 0 ).z, 0.01d ); } @Test @@ -220,7 +220,7 @@ public void testTransformDefToXY() assertEquals( 1, transformedPoints.size() ); assertTrue( 9.4 < transformedPoints.get( 0 ).x && 9.45 > transformedPoints.get( 0 ).x ); assertTrue( 47.825 < transformedPoints.get( 0 ).y && 47.875 > transformedPoints.get( 0 ).y ); - assertEquals( 817.0, transformedPoints.get( 0 ).z ); + assertEquals( 817.0, transformedPoints.get( 0 ).z, 0.01d ); } @Test diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/DomainOfValidityTest.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/DomainOfValidityTest.java index 09c364e0b0..4e17d75f4e 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/DomainOfValidityTest.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/coordinatesystems/DomainOfValidityTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.cs.coordinatesystems; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.cs.transformations.CRSDefines; import org.junit.Test; diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracy.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracy.java index f7ac29540b..642e39cc59 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracy.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracy.java @@ -1,7 +1,7 @@ package org.deegree.cs.transformations; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.ArrayList; import java.util.List; diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracyTest.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracyTest.java index e659d13fa4..29719d5c92 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracyTest.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationAccuracyTest.java @@ -42,7 +42,7 @@ import javax.vecmath.Point3d; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; diff --git a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationSubstitutionTest.java b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationSubstitutionTest.java index cd4c2fc696..2d0f7f24c3 100644 --- a/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationSubstitutionTest.java +++ b/deegree-core/deegree-core-cs/src/test/java/org/deegree/cs/transformations/TransformationSubstitutionTest.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.cs.CRSCodeType; import org.deegree.cs.CRSIdentifiable; diff --git a/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/parsing/FeatureInfoParserTest.java b/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/parsing/FeatureInfoParserTest.java index 940ea87f04..7d6ac36839 100644 --- a/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/parsing/FeatureInfoParserTest.java +++ b/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/parsing/FeatureInfoParserTest.java @@ -47,7 +47,7 @@ Occam Labs UG (haftungsbeschränkt) import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.feature.FeatureCollection; import org.junit.Test; diff --git a/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/templating/Templating2ParserTest.java b/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/templating/Templating2ParserTest.java index bf9264a2ec..b2784f901a 100644 --- a/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/templating/Templating2ParserTest.java +++ b/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/templating/Templating2ParserTest.java @@ -46,7 +46,7 @@ Occam Labs UG (haftungsbeschränkt) import java.io.IOException; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.antlr.runtime.ANTLRInputStream; import org.antlr.runtime.CharStream; diff --git a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/GeometryAnalysisTest.java b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/GeometryAnalysisTest.java index 446e3e9694..45615e4478 100644 --- a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/GeometryAnalysisTest.java +++ b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/GeometryAnalysisTest.java @@ -35,8 +35,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.geometry; -import static junit.framework.Assert.assertTrue; -import junit.framework.Assert; +import static org.junit.Assert.assertTrue; +import org.junit.Assert; import org.deegree.cs.CRSUtils; import org.deegree.cs.coordinatesystems.ICRS; diff --git a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/QTreeTest.java b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/QTreeTest.java index 30b8ef743d..d122c86a2d 100644 --- a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/QTreeTest.java +++ b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/QTreeTest.java @@ -44,7 +44,7 @@ import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.index.QTree; import org.deegree.commons.utils.GraphvizDot; diff --git a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/SFSProfilerTest.java b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/SFSProfilerTest.java index 1fc5969c87..20175e0e5a 100644 --- a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/SFSProfilerTest.java +++ b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/SFSProfilerTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.geometry; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Collections; @@ -77,8 +77,8 @@ public void setUp() { public void simplifyPoint() { Point original = fac.createPoint( null, 47.11, 23.09, CRSUtils.EPSG_4326 ); Point simplified = simplifier.simplify( original ); - assertEquals( original.get0(), simplified.get0() ); - assertEquals( original.get1(), simplified.get1() ); + assertEquals( original.get0(), simplified.get0(), 0.01d ); + assertEquals( original.get1(), simplified.get1(), 0.01d ); assertEquals( original.getCoordinateSystem(), simplified.getCoordinateSystem() ); } @@ -91,14 +91,14 @@ public void simplifyLineString() { LineString ls = fac.createLineString( null, CRSUtils.EPSG_4326, new PointsArray( p0, p1, p2, p3 ) ); LineString simplified = simplifier.simplify( ls ); assertEquals( 4, simplified.getControlPoints().size() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1() ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0(), 0.01d ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1(), 0.01d ); } @Test @@ -111,14 +111,14 @@ public void simplifyCurve1() { Curve curve = fac.createCurve( null, CRSUtils.EPSG_4326, segment ); LineString simplified = simplifier.simplify( curve ); assertEquals( 4, simplified.getControlPoints().size() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1() ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0(), 0.01d ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1(), 0.01d ); } @Test @@ -136,20 +136,20 @@ public void simplifyCurve2() { LineString simplified = simplifier.simplify( curve ); assertEquals( 7, simplified.getControlPoints().size() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1() ); - assertEquals( 20.0, simplified.getControlPoints().get( 4 ).get0() ); - assertEquals( 20.0, simplified.getControlPoints().get( 4 ).get1() ); - assertEquals( 30.0, simplified.getControlPoints().get( 5 ).get0() ); - assertEquals( 30.0, simplified.getControlPoints().get( 5 ).get1() ); - assertEquals( 0.0, simplified.getControlPoints().get( 6 ).get0() ); - assertEquals( 0.0, simplified.getControlPoints().get( 6 ).get1() ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0(), 0.01d ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1(), 0.01d ); + assertEquals( 20.0, simplified.getControlPoints().get( 4 ).get0(), 0.01d ); + assertEquals( 20.0, simplified.getControlPoints().get( 4 ).get1(), 0.01d ); + assertEquals( 30.0, simplified.getControlPoints().get( 5 ).get0(), 0.01d ); + assertEquals( 30.0, simplified.getControlPoints().get( 5 ).get1(), 0.01d ); + assertEquals( 0.0, simplified.getControlPoints().get( 6 ).get0(), 0.01d ); + assertEquals( 0.0, simplified.getControlPoints().get( 6 ).get1(), 0.01d ); } @Test @@ -166,16 +166,16 @@ public void simplifyCurve3() { LineString simplified = simplifier.simplify( curve ); assertEquals( POINTS_PER_ARC + 3, simplified.getControlPoints().size() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0() ); - assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0() ); - assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0() ); - assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0() ); - assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1() ); - assertEquals( 30.0, simplified.getEndPoint().get0() ); - assertEquals( 35.0, simplified.getEndPoint().get1() ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get0(), 0.01d ); + assertEquals( 0.0, simplified.getControlPoints().get( 0 ).get1(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get0(), 0.01d ); + assertEquals( 1.0, simplified.getControlPoints().get( 1 ).get1(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get0(), 0.01d ); + assertEquals( 5.0, simplified.getControlPoints().get( 2 ).get1(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get0(), 0.01d ); + assertEquals( 10.0, simplified.getControlPoints().get( 3 ).get1(), 0.01d ); + assertEquals( 30.0, simplified.getEndPoint().get0(), 0.01d ); + assertEquals( 35.0, simplified.getEndPoint().get1(), 0.01d ); } @Test diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/java/org/deegree/protocol/ows/http/OwsHttpResponseTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/java/org/deegree/protocol/ows/http/OwsHttpResponseTest.java index 097f647879..38f005a40c 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/java/org/deegree/protocol/ows/http/OwsHttpResponseTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-commons/src/test/java/org/deegree/protocol/ows/http/OwsHttpResponseTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.protocol.ows.http; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-csw/src/test/java/org/deegree/protocol/csw/client/getrecords/GetRecordsResponseTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-csw/src/test/java/org/deegree/protocol/csw/client/getrecords/GetRecordsResponseTest.java index 38a16ab8fd..afdce687ee 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-csw/src/test/java/org/deegree/protocol/csw/client/getrecords/GetRecordsResponseTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-csw/src/test/java/org/deegree/protocol/csw/client/getrecords/GetRecordsResponseTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.protocol.csw.client.getrecords; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.metadata.iso.ISORecord.ISO_RECORD_NS; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSClientTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSClientTest.java index 75790e8e2a..e5ed87d417 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSClientTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSClientTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.protocol.wfs.client; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; import static org.deegree.gml.GMLVersion.GML_31; import static org.deegree.protocol.wfs.WFSVersion.WFS_100; import static org.deegree.protocol.wfs.WFSVersion.WFS_110; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSFeatureCollectionTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSFeatureCollectionTest.java index 4017c497eb..d82a69c6ea 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSFeatureCollectionTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/client/WFSFeatureCollectionTest.java @@ -35,8 +35,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.protocol.wfs.client; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import java.io.IOException; import java.net.URL; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/describefeaturetype/xml/DescribeFeatureTypeXMLAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/describefeaturetype/xml/DescribeFeatureTypeXMLAdapterTest.java index c7af05e630..c344aa124c 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/describefeaturetype/xml/DescribeFeatureTypeXMLAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/describefeaturetype/xml/DescribeFeatureTypeXMLAdapterTest.java @@ -38,7 +38,7 @@ package org.deegree.protocol.wfs.describefeaturetype.xml; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.protocol.wfs.WFSConstants.VERSION_200; import java.net.MalformedURLException; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getfeaturewithlock/xml/GetFeatureWithLockXMLAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getfeaturewithlock/xml/GetFeatureWithLockXMLAdapterTest.java index 4b3e199efc..2d7020ee55 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getfeaturewithlock/xml/GetFeatureWithLockXMLAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getfeaturewithlock/xml/GetFeatureWithLockXMLAdapterTest.java @@ -38,8 +38,8 @@ package org.deegree.protocol.wfs.getfeaturewithlock.xml; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.deegree.protocol.wfs.WFSConstants.VERSION_200; import static org.junit.Assert.assertFalse; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/kvp/GetPropertyValueKVPAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/kvp/GetPropertyValueKVPAdapterTest.java index 53b5cf9210..ec14b72e56 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/kvp/GetPropertyValueKVPAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/kvp/GetPropertyValueKVPAdapterTest.java @@ -44,7 +44,7 @@ import javax.xml.namespace.QName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.deegree.commons.tom.ResolveMode; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/xml/GetPropertyValueXMLAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/xml/GetPropertyValueXMLAdapterTest.java index 1bc0b1d09e..8130b45d52 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/xml/GetPropertyValueXMLAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/getpropertyvalue/xml/GetPropertyValueXMLAdapterTest.java @@ -38,10 +38,10 @@ package org.deegree.protocol.wfs.getpropertyvalue.xml; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.deegree.protocol.wfs.WFSConstants.VERSION_200; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.tom.ResolveMode; import org.deegree.filter.OperatorFilter; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/lockfeature/xml/LockFeatureXMLAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/lockfeature/xml/LockFeatureXMLAdapterTest.java index a3fc2b2db3..c99274f628 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/lockfeature/xml/LockFeatureXMLAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/src/test/java/org/deegree/protocol/wfs/lockfeature/xml/LockFeatureXMLAdapterTest.java @@ -38,8 +38,8 @@ package org.deegree.protocol.wfs.lockfeature.xml; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.deegree.protocol.wfs.WFSConstants.VERSION_200; import static org.junit.Assert.assertFalse; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/java/org/deegree/protocol/wmts/client/WMTSCapabilitiesAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/java/org/deegree/protocol/wmts/client/WMTSCapabilitiesAdapterTest.java index dda6ffdb5b..90cd96497c 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/java/org/deegree/protocol/wmts/client/WMTSCapabilitiesAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/src/test/java/org/deegree/protocol/wmts/client/WMTSCapabilitiesAdapterTest.java @@ -37,7 +37,7 @@ import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.deegree.commons.xml.stax.XMLStreamUtils.skipStartDocument; import static org.deegree.protocol.wmts.WMTSConstants.WMTS_100_NS; diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/RecordSerializeTest.java b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/RecordSerializeTest.java index 41142fa17e..279402cd13 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/RecordSerializeTest.java +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/RecordSerializeTest.java @@ -44,7 +44,7 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.xml.CommonNamespaces; import org.deegree.commons.xml.NamespaceBindings; diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/io/EbrimEOAdapterTest.java b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/io/EbrimEOAdapterTest.java index e4777654a9..99656ecddd 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/io/EbrimEOAdapterTest.java +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/java/org/deegree/metadata/persistence/ebrim/eo/io/EbrimEOAdapterTest.java @@ -35,10 +35,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.metadata.persistence.ebrim.eo.io; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.deegree.metadata.persistence.ebrim.eo.mapping.SlotMapper.SLOTURN; import java.io.InputStream; diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ISOMemoryMetadataStoreTransactionTest.java b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ISOMemoryMetadataStoreTransactionTest.java index 57c4ba5049..636a657f79 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ISOMemoryMetadataStoreTransactionTest.java +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ISOMemoryMetadataStoreTransactionTest.java @@ -35,7 +35,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.metadata.iso.persistence.memory; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import java.io.File; diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ListMetadataResultSetTest.java b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ListMetadataResultSetTest.java index 76ff3caa8b..f36e48571c 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ListMetadataResultSetTest.java +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/ListMetadataResultSetTest.java @@ -35,10 +35,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.metadata.iso.persistence.memory; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.deegree.metadata.iso.persistence.memory.GetTestRecordsUtils.getAllRecords; import org.junit.Test; diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/StoredISORecordsTest.java b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/StoredISORecordsTest.java index 71e76f5729..31f5f0ed15 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/StoredISORecordsTest.java +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/test/java/org/deegree/metadata/iso/persistence/memory/StoredISORecordsTest.java @@ -36,10 +36,10 @@ package org.deegree.metadata.iso.persistence.memory; import static java.util.Collections.singletonList; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.deegree.metadata.iso.persistence.memory.GetTestRecordsUtils.getRecord; import java.util.ArrayList; diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/test/java/org/deegree/tile/persistence/filesystem/layout/TileCacheDiskLayoutTest.java b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/test/java/org/deegree/tile/persistence/filesystem/layout/TileCacheDiskLayoutTest.java index b68ccfce95..3ba127db33 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/test/java/org/deegree/tile/persistence/filesystem/layout/TileCacheDiskLayoutTest.java +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/test/java/org/deegree/tile/persistence/filesystem/layout/TileCacheDiskLayoutTest.java @@ -34,7 +34,7 @@ package org.deegree.tile.persistence.filesystem.layout; import static java.util.Collections.singletonList; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; import java.io.File; diff --git a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java index 8dbe24957a..b9bdfb7545 100644 --- a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java +++ b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java @@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; diff --git a/deegree-services/deegree-services-wms/src/test/java/org/deegree/services/wms/controller/capabilities/theme/XMLMemoryStreamWriter.java b/deegree-services/deegree-services-wms/src/test/java/org/deegree/services/wms/controller/capabilities/theme/XMLMemoryStreamWriter.java index a06282371d..b7ac87aabb 100644 --- a/deegree-services/deegree-services-wms/src/test/java/org/deegree/services/wms/controller/capabilities/theme/XMLMemoryStreamWriter.java +++ b/deegree-services/deegree-services-wms/src/test/java/org/deegree/services/wms/controller/capabilities/theme/XMLMemoryStreamWriter.java @@ -45,7 +45,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pom.xml b/pom.xml index 20e516e311..66723b87f4 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,7 @@ junit junit - 4.12 + 4.13.2 test diff --git a/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/test/java/org/deegree/protocol/wps/TestVectorLayerAdapter.java b/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/test/java/org/deegree/protocol/wps/TestVectorLayerAdapter.java index ce960d17b3..774bde845e 100644 --- a/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/test/java/org/deegree/protocol/wps/TestVectorLayerAdapter.java +++ b/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/test/java/org/deegree/protocol/wps/TestVectorLayerAdapter.java @@ -39,7 +39,7 @@ import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.deegree.commons.tom.TypedObjectNode; import org.deegree.commons.tom.gml.property.Property;