sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1564822 - in /sis/branches/JDK7: ./ core/sis-metadata/src/test/java/org/apache/sis/test/mock/ core/sis-referencing/src/test/java/org/apache/sis/geometry/ core/sis-referencing/src/test/java/org/apache/sis/referencing/ core/sis-referencing/s...
Date Wed, 05 Feb 2014 16:14:52 GMT
Author: desruisseaux
Date: Wed Feb  5 16:14:51 2014
New Revision: 1564822

URL: http://svn.apache.org/r1564822
Log:
Moved mocks to the modules that use them.

Added:
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
      - copied unchanged from r1564728, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
      - copied, changed from r1564821, sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/GeodeticDatumMock.java
      - copied unchanged from r1564728, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/GeodeticDatumMock.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java
      - copied, changed from r1564728, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/package-info.txt
      - copied unchanged from r1564821, sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/mock/package-info.txt
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/package-info.txt
      - copied unchanged from r1564821, sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/package-info.txt
Removed:
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/GeodeticDatumMock.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
Modified:
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
    sis/branches/JDK7/pom.xml

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static java.lang.Double.NaN;
 import static org.opengis.test.Validators.*;
-import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.ReferencingAssert.*;
 
 
 /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -23,7 +23,7 @@ import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.opengis.test.Validators.*;
-import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.ReferencingAssert.*;
 import static org.apache.sis.geometry.AbstractEnvelopeTest.WGS84;
 import static org.apache.sis.geometry.AbstractEnvelopeTest.STRICT;
 

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 import static java.lang.Double.NaN;
 import static org.opengis.test.Validators.*;
-import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.ReferencingAssert.*;
 import static org.apache.sis.geometry.AbstractEnvelopeTest.WGS84;
 import static org.apache.sis.geometry.AbstractEnvelopeTest.STRICT;
 

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -21,7 +21,7 @@ import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.opengis.test.Validators.*;
-import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.ReferencingAssert.*;
 import static org.apache.sis.geometry.AbstractEnvelopeTest.WGS84;
 
 

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static java.util.Collections.singletonMap;
 import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
-import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.ReferencingAssert.*;
 
 
 /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.test.XMLTestCase;
 import org.junit.Test;
 
-import static org.apache.sis.referencing.Assert.*;
+import static org.apache.sis.test.ReferencingAssert.*;
 import static org.apache.sis.test.TestUtilities.getSingleton;
 
 

Copied: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
(from r1564821, sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java?p2=sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java&p1=sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java&r1=1564821&r2=1564822&rev=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.referencing;
+package org.apache.sis.test;
 
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
@@ -44,7 +44,7 @@ import static java.lang.StrictMath.*;
  * @version 0.4
  * @module
  */
-public strictfp class Assert extends org.apache.sis.test.MetadataAssert {
+public strictfp class ReferencingAssert extends MetadataAssert {
     /**
      * The tolerance threshold for strict comparisons of floating point values.
      */
@@ -53,7 +53,7 @@ public strictfp class Assert extends org
     /**
      * For subclass constructor only.
      */
-    protected Assert() {
+    protected ReferencingAssert() {
     }
 
     /**

Copied: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java
(from r1564728, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java?p2=sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java&p1=sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java&r1=1564728&r2=1564822&rev=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/PrimeMeridianMock.java
[UTF-8] Wed Feb  5 16:14:51 2014
@@ -19,6 +19,7 @@ package org.apache.sis.test.mock;
 import javax.measure.unit.Unit;
 import javax.measure.unit.NonSI;
 import javax.measure.quantity.Angle;
+import org.apache.sis.test.mock.IdentifiedObjectMock;
 import org.opengis.referencing.datum.PrimeMeridian;
 
 

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1564822&r1=1564821&r2=1564822&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Wed Feb  5 16:14:51 2014
@@ -672,11 +672,11 @@ Apache SIS is a free software, Java lang
             </group>
             <group>
               <title>Referencing</title>
-              <packages>org.apache.sis.referencing*:org.apache.sis.parameter*:org.apache.sis.io.wkt</packages>
+              <packages>org.apache.sis.referencing*:org.apache.sis.parameter*</packages>
             </group>
             <group>
               <title>Metadata</title>
-              <packages>org.apache.sis.metadata*</packages>
+              <packages>org.apache.sis.metadata*:org.apache.sis.io.wkt</packages>
             </group>
             <group>
               <title>Utilities</title>



Mime
View raw message