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 d2e69ea24ad..c8f7aede699 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 @@ -34,7 +34,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; @@ -45,7 +45,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 de5948145a9..8129f7cb75d 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 @@ -45,7 +45,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 80135aef12e..938a27fa904 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 @@ -34,7 +34,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 a5389336f45..a7ef2541678 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 @@ -37,7 +37,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 94c65b3b71f..e0287ec451e 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 @@ -34,7 +34,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 c320439b4dc..50c1660622d 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 @@ -40,7 +40,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; @@ -88,12 +88,12 @@ public void parseArc() throws XMLStreamException, FactoryConfigurationError, IOE 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 @@ -103,17 +103,17 @@ public void parseArcByBulge() throws XMLStreamException, FactoryConfigurationErr 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 @@ -122,13 +122,13 @@ public void parseArcByCenterPoint() throws XMLStreamException, FactoryConfigurat 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()); } @@ -138,20 +138,20 @@ public void parseArcString() throws XMLStreamException, FactoryConfigurationErro 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 @@ -161,14 +161,14 @@ public void parseArcStringByBulge() throws XMLStreamException, FactoryConfigurat 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 @@ -176,22 +176,22 @@ public void parseBezier() throws XMLStreamException, FactoryConfigurationError, UnknownCRSException { 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 @@ -200,22 +200,22 @@ public void parseBSpline() throws XMLStreamException, FactoryConfigurationError, 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 @@ -224,12 +224,12 @@ public void parseCircle() throws XMLStreamException, FactoryConfigurationError, 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 @@ -238,13 +238,13 @@ public void parseCircleByCenterPoint() throws XMLStreamException, FactoryConfigu 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()); } @@ -253,21 +253,21 @@ public void parseClothoid() throws XMLStreamException, FactoryConfigurationError 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 @@ -276,16 +276,16 @@ public void parseCubicSpline() throws XMLStreamException, FactoryConfigurationEr 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 @@ -293,10 +293,10 @@ public void parseGeodesic() throws XMLStreamException, FactoryConfigurationError 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 @@ -304,12 +304,12 @@ public void parseGeodesicString() throws XMLStreamException, FactoryConfiguratio XMLParsingException, UnknownCRSException { 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 @@ -318,12 +318,12 @@ public void parseLineStringSegment() throws XMLStreamException, FactoryConfigura 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 @@ -331,9 +331,9 @@ public void parseOffsetCurve() throws XMLStreamException, FactoryConfigurationEr XMLParsingException, 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 30906584496..1f54977ef0a 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 @@ -40,7 +40,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; @@ -71,10 +71,10 @@ public void parsePolygonPatch() throws XMLStreamException, FactoryConfigurationE 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 03a78d0c703..6d3dea9ea11 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 @@ -34,7 +34,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 74bd2059aa8..fa51501aa2f 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 @@ -44,7 +44,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 54379025634..12991b306d7 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 @@ -41,9 +41,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 d23a4932154..da24e92dfdd 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 @@ -37,7 +37,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 e6d28150368..450ca9bcb9d 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 @@ -34,7 +34,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; @@ -50,7 +50,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 7a492721915..6dd270d778b 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 @@ -36,7 +36,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 a04a29b43d2..86d2e53d57e 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 @@ -40,7 +40,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 3f70bca92a8..bbf9d525337 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 @@ -47,7 +47,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 f4cab88dbdd..846555c71d2 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 @@ -34,7 +34,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; @@ -42,7 +42,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 53d2b88913e..8227354b0a6 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 @@ -59,7 +59,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; @@ -117,7 +117,7 @@ public void testFloatRaster() throws IOException { 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 a475cb058e0..3dca4073f53 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 @@ -45,7 +45,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.commons.utils.TunableParameter; 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 f7fc2a2e0d7..d9b8f2b5d73 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 @@ -37,10 +37,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; @@ -81,12 +81,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 9370045c3a5..e48067eeaa1 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 @@ -37,7 +37,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 e8b2049b0fd..9316d21088b 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 @@ -46,7 +46,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 3aee4f09886..25b4b0512d9 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 @@ -37,7 +37,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; @@ -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.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 7bfde998c54..6599e669863 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 @@ -42,7 +42,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 2e78ba061ee..a9ed0a89a63 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 @@ -43,7 +43,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 6f2dba459f7..da1fff80fea 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 @@ -43,7 +43,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 c48818817ff..36382046f17 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 @@ -35,9 +35,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 ca2565117fd..82082afcbd5 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 @@ -45,7 +45,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; @@ -135,25 +135,25 @@ public void testProjectedCS() throws IOException { 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 cf954149308..c7926afa44b 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 @@ -34,9 +34,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; @@ -91,9 +91,9 @@ public void testWGS84DefToDef() throws UnknownCRSException, IllegalArgumentExcep 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 @@ -107,9 +107,9 @@ public void testWGS84XYToDef() throws UnknownCRSException, IllegalArgumentExcept 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 @@ -123,9 +123,9 @@ public void testWGS84XYToXY() throws UnknownCRSException, IllegalArgumentExcepti 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 @@ -139,9 +139,9 @@ public void testWGS84DefToXY() throws UnknownCRSException, IllegalArgumentExcept 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 @@ -158,7 +158,7 @@ public void testTransformDefToDef() throws UnknownCRSException, IllegalArgumentE 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 @@ -175,7 +175,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 @@ -191,7 +191,7 @@ public void testTransformXYToDef() throws UnknownCRSException, IllegalArgumentEx 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 @@ -207,7 +207,7 @@ public void testTransformDefToXY() throws UnknownCRSException, IllegalArgumentEx 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 0651725166a..bd39cc6842c 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 @@ -34,7 +34,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 18732f41460..0fde0c64934 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 7d432322c1b..e4fa762843b 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 @@ -41,7 +41,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 059c53b2340..982983a1a91 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 @@ -38,7 +38,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/templating/Templating2ParserTest.java b/deegree-core/deegree-core-featureinfo/src/test/java/org/deegree/featureinfo/templating/Templating2ParserTest.java index 5ed75c20c99..dfaa221dcbc 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 @@ -45,7 +45,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 47edf231531..b4d6e5e78ad 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 @@ -34,8 +34,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 cd4344098ab..bc57450c52d 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 @@ -43,7 +43,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 81f98f612b0..42d03f34e83 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 @@ -34,7 +34,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; @@ -76,8 +76,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()); } @@ -90,14 +90,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 @@ -110,14 +110,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 @@ -135,20 +135,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 @@ -165,16 +165,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 97fb4108865..dcc4e89b81f 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,9 +35,9 @@ package org.deegree.protocol.ows.http; import static java.nio.charset.StandardCharsets.UTF_8; -import static junit.framework.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; 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 42792b4ad0b..65fc87f428e 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 @@ -34,7 +34,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 47791102ab5..4602f8f517a 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 @@ -34,7 +34,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 54be7154489..181ac225d6a 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 @@ -34,8 +34,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 f17273e9ca7..192e6132cdb 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 @@ -37,7 +37,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 572b2ff42f0..3eeb526499c 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 @@ -37,8 +37,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 0f78c50c176..292f98ba91c 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 @@ -43,7 +43,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 34f16a84ea7..21daf403a0b 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 @@ -37,10 +37,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 012e2b63962..7dc251233e5 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 @@ -37,8 +37,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 84ca95999af..45054965cb4 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 @@ -36,7 +36,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 454e5d32ed2..cd12791dce0 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 @@ -43,7 +43,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 16d881a9726..bd840f377c8 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 @@ -34,10 +34,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 837d5d53808..2d887072d5c 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 @@ -34,7 +34,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 d3e8e5d40ab..bfe5e6ea33e 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 @@ -34,10 +34,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 8879dcbd859..e1139163809 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 @@ -35,10 +35,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 df0a3ca2123..e0527ae5d2b 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 @@ -33,7 +33,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 46af01df17a..1eac2923c15 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 @@ -36,7 +36,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 8391cacba48..60c5e75c029 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 @@ -44,7 +44,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 beb809b7d6a..23601f2ad9f 100644 --- a/pom.xml +++ b/pom.xml @@ -455,7 +455,7 @@ junit junit - 4.13.1 + 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 5fef56e04e0..ff70e5978b1 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 @@ -38,7 +38,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;