[Geotools-commits] svn - r38709 - in trunk/modules: library/referencing/src/test/java/org/geotools/referencing/factory/epsg plugin/epsg-hsql/src/test/java/org/geotools/referencing/factory

[<svn...@os...>]

Author: jive
Date: 2012-05-10 02:56:21 -0700 (Thu, 10 May 2012)
New Revision: 38709

Modified:
   trunk/modules/library/referencing/src/test/java/org/geotools/referencing/factory/epsg/FallbackAuthorityFactoryTest.java
   trunk/modules/plugin/epsg-hsql/src/test/java/org/geotools/referencing/factory/URN_EPSG_Test.java
Log:
Use CRS reset to clear the slate during testing of anything with the fallback factory, see GEOT-4134

Modified: trunk/modules/library/referencing/src/test/java/org/geotools/referencing/factory/epsg/FallbackAuthorityFactoryTest.java
===================================================================
--- trunk/modules/library/referencing/src/test/java/org/geotools/referencing/factory/epsg/FallbackAuthorityFactoryTest.java	2012-05-10 09:16:34 UTC (rev 38708)
+++ trunk/modules/library/referencing/src/test/java/org/geotools/referencing/factory/epsg/FallbackAuthorityFactoryTest.java	2012-05-10 09:56:21 UTC (rev 38709)
@@ -60,6 +60,8 @@
     @Before
     public void setUp() {
         assertNull(extra);
+        
+        CRS.reset("all");
         extra = new FactoryEPSGExtra();
         ReferencingFactoryFinder.addAuthorityFactory(extra);
         ReferencingFactoryFinder.scanForPlugins();
@@ -81,12 +83,15 @@
      */
     @Test
     public void testFactoryOrdering() {
-        Set factories =  ReferencingFactoryFinder.getCRSAuthorityFactories(null);
+        Set<CRSAuthorityFactory> factories =  ReferencingFactoryFinder.getCRSAuthorityFactories(null);
+        for( CRSAuthorityFactory factory : factories ){
+            System.out.println("--> "+factory.getClass().getSimpleName() );
+        }
         boolean foundWkt = false;
         boolean foundExtra = false;
-        for (Iterator it = factories.iterator(); it.hasNext();) {
+        for (Iterator<CRSAuthorityFactory> it = factories.iterator(); it.hasNext();) {
             CRSAuthorityFactory factory = (CRSAuthorityFactory) it.next();
-            Class type = factory.getClass();
+            Class<?> type = factory.getClass();
             if (VERBOSE) {
                 System.out.println(type);
             }

Modified: trunk/modules/plugin/epsg-hsql/src/test/java/org/geotools/referencing/factory/URN_EPSG_Test.java
===================================================================
--- trunk/modules/plugin/epsg-hsql/src/test/java/org/geotools/referencing/factory/URN_EPSG_Test.java	2012-05-10 09:16:34 UTC (rev 38708)
+++ trunk/modules/plugin/epsg-hsql/src/test/java/org/geotools/referencing/factory/URN_EPSG_Test.java	2012-05-10 09:56:21 UTC (rev 38709)
@@ -88,6 +88,8 @@
      * Tests versioning.
      */
     public void testVersion() throws FactoryException {
+        CRS.reset("all");
+        
         CoordinateReferenceSystem expected = CRS.decode("EPSG:4326");
         final String version = String.valueOf(CRS.getVersion("EPSG"));
         final String urn = "urn:ogc:def:crs:EPSG:" + version + ":4326";