sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1601015 - /sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/
Date Fri, 06 Jun 2014 21:19:37 GMT
Author: desruisseaux
Date: Fri Jun  6 21:19:37 2014
New Revision: 1601015

URL: http://svn.apache.org/r1601015
Log:
Post-merge cleanup: rearrange import statements in order to isolate the test classes not available
in GeoAPI 3.0.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbstractMathTransformTest.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -19,17 +19,16 @@ package org.apache.sis.referencing.opera
 import java.util.Arrays;
 import java.util.Random;
 import org.opengis.referencing.operation.TransformException;
+import static java.lang.StrictMath.*;
+import static org.apache.sis.referencing.operation.transform.AbstractMathTransform.MAXIMUM_FAILURES;
+import static org.apache.sis.referencing.operation.transform.AbstractMathTransform.MAXIMUM_BUFFER_SIZE;
 
 // Test imports
 import org.junit.Test;
 import org.apache.sis.test.TestCase;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.DependsOnMethod;
-
 import static org.junit.Assert.*;
-import static java.lang.StrictMath.*;
-import static org.apache.sis.referencing.operation.transform.AbstractMathTransform.MAXIMUM_FAILURES;
-import static org.apache.sis.referencing.operation.transform.AbstractMathTransform.MAXIMUM_BUFFER_SIZE;
 
 
 /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -19,12 +19,11 @@ package org.apache.sis.referencing.opera
 import java.util.Random;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
+import static java.lang.StrictMath.*;
 
 // Test imports
 import org.apache.sis.test.mock.GeodeticDatumMock;
 
-import static java.lang.StrictMath.*;
-
 
 /**
  * The domain of input coordinates.

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/IterationStrategyTest.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -19,15 +19,14 @@ package org.apache.sis.referencing.opera
 import java.util.Arrays;
 import java.util.Random;
 import org.opengis.referencing.operation.TransformException;
+import static java.lang.StrictMath.*;
+import static org.apache.sis.referencing.operation.transform.IterationStrategy.*;
 
 // Test imports
 import org.junit.Test;
 import org.apache.sis.test.TestCase;
 import org.apache.sis.test.DependsOnMethod;
-
 import static org.junit.Assert.*;
-import static java.lang.StrictMath.*;
-import static org.apache.sis.referencing.operation.transform.IterationStrategy.*;
 
 
 /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -26,7 +26,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.apache.sis.test.DependsOn;
-
 import static org.opengis.test.Assert.*;
 
 

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -29,6 +29,8 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.SingleOperation;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
+
+// Test imports
 import org.apache.sis.metadata.iso.citation.HardCodedCitations;
 
 

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -37,18 +37,19 @@ import org.apache.sis.io.TableAppender;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.internal.util.Numerics;
+import static java.lang.StrictMath.*;
 
 // Test imports
 import org.opengis.test.Validators;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
 import org.opengis.test.referencing.TransformTestCase;
 import org.apache.sis.test.TestCase;
 import org.apache.sis.test.TestUtilities;
-
-import static java.lang.StrictMath.*;
 import static org.apache.sis.test.ReferencingAssert.*;
 
+// Branch-dependent imports
+import org.opengis.test.CalculationType;
+import org.opengis.test.ToleranceModifier;
+
 
 /**
  * Base class for tests of {@link AbstractMathTransform} implementations.
@@ -315,7 +316,7 @@ public abstract strictfp class MathTrans
         final int numPts    = ORDINATE_COUNT / dimension;
         final Random random = TestUtilities.createRandomNumberGenerator();
         final double[] coordinates = domain.generateRandomInput(random, dimension, numPts);
-        for (int i = Math.round(coordinates.length * propNaN); --i >= 0;) {
+        for (int i = round(coordinates.length * propNaN); --i >= 0;) {
             coordinates[random.nextInt(coordinates.length)] = Double.NaN;
         }
         if (TestCase.verbose) {

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -27,13 +27,14 @@ import org.apache.sis.util.ArraysExt;
 
 // Test imports
 import org.junit.Test;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
 import org.apache.sis.test.TestUtilities;
 import org.apache.sis.test.DependsOn;
-
 import static org.junit.Assert.*;
 
+// Branch-dependent imports
+import org.opengis.test.CalculationType;
+import org.opengis.test.ToleranceModifier;
+
 
 /**
  * Tests {@link PassThroughTransform}.

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java?rev=1601015&r1=1601014&r2=1601015&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
[UTF-8] Fri Jun  6 21:19:37 2014
@@ -25,15 +25,16 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.parameter.Parameterized;
 
 // Test imports
-import org.opengis.test.referencing.AffineTransformTest;
 import org.opengis.test.Validators;
 import org.apache.sis.test.DependsOn;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.junit.After;
-
 import static org.opengis.test.Assert.*;
 
+// Branch-dependent imports
+import org.opengis.test.referencing.AffineTransformTest;
+
 
 /**
  * Tests the {@link ProjectiveTransform} class by inheriting the tests defined in GeoAPI
conformance module.



Mime
View raw message