svn - r33524 - trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex

[svn_geotools]

Author: ang05a
Date: 2009-07-08 01:12:20 -0400 (Wed, 08 Jul 2009)
New Revision: 33524

Modified:
   trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/AppSchemaDataAccessRegistryTest.java
   trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/DataAccessIntegrationTest.java
   trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/GeologicUnitTest.java
Log:
Refactor feature chaining tests

Modified: trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/AppSchemaDataAccessRegistryTest.java
===================================================================
--- trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/AppSchemaDataAccessRegistryTest.java 2009-07-08 04:14:53 UTC (rev 33523)
+++ trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/AppSchemaDataAccessRegistryTest.java 2009-07-08 05:12:20 UTC (rev 33524)
@@ -109,7 +109,7 @@
         this.checkRegisteredDataAccess(cgiDataAccess, CGI_TERM_VALUE, true);
         this.checkRegisteredDataAccess(ccDataAccess, CONTROLLED_CONCEPT, true);
 
-        disposeDataAccesses();
+        DataAccessRegistry.unregisterAll();
     }
 
     /**
@@ -126,7 +126,7 @@
         unregister(cgiDataAccess, CGI_TERM_VALUE);
         unregister(ccDataAccess, CONTROLLED_CONCEPT);
 
-        disposeDataAccesses();
+        DataAccessRegistry.unregisterAll();
     }
 
     /**
@@ -150,7 +150,7 @@
         }
         assertTrue("Expected a DataSourceException to have been thrown and handled",
                 handledException);
-        disposeDataAccesses();
+        DataAccessRegistry.unregisterAll();
     }
 
     /**
@@ -263,20 +263,4 @@
             fail("Expecting DataSourceException but didn't occur. Deregistering data access fails.");
         }
     }
-
-    /**
-     * Dispose all the data accesses after use
-     */
-    private void disposeDataAccesses() {
-        if (mfDataAccess == null || guDataAccess == null || cpDataAccess == null
-                || cgiDataAccess == null || ccDataAccess == null) {
-            throw new UnsupportedOperationException(
-                    "This is to be called after data accesses are created!");
-        }
-        mfDataAccess.dispose();
-        guDataAccess.dispose();
-        cpDataAccess.dispose();
-        cgiDataAccess.dispose();
-        ccDataAccess.dispose();
-    }
 }

Modified: trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/DataAccessIntegrationTest.java
===================================================================
--- trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/DataAccessIntegrationTest.java 2009-07-08 04:14:53 UTC (rev 33523)
+++ trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/DataAccessIntegrationTest.java 2009-07-08 05:12:20 UTC (rev 33524)
@@ -375,9 +375,19 @@
         while (mfIterator.hasNext()) {
             mfFeatures.add(mfIterator.next());
         }
-        mfCollection.close(mfIterator);
+        mfCollection.close(mfIterator);      
 
         /**
+         * Load CGI Term Value data access
+         */
+        url = getClass().getResource(schemaBase + "CGITermValue.xml");
+        assertNotNull(url);
+
+        dsParams.put("url", url.toExternalForm());
+        DataAccess<FeatureType, Feature> cgiDataAccess = DataAccessFinder.getDataStore(dsParams);
+        assertNotNull(cgiDataAccess);
+
+        /**
          * Load composition part data access
          */
         url = getClass().getResource(schemaBase + "CompositionPart.xml");
@@ -392,30 +402,11 @@
         FeatureCollection<FeatureType, Feature> cpCollection = cpSource.getFeatures();
         Iterator<Feature> cpIterator = cpCollection.iterator();
 
-        /**
-         * Load CGI Term Value data access
-         */
-        url = getClass().getResource(schemaBase + "CGITermValue.xml");
-        assertNotNull(url);
-
-        dsParams.put("url", url.toExternalForm());
-        DataAccess<FeatureType, Feature> cgiDataAccess = DataAccessFinder.getDataStore(dsParams);
-        assertNotNull(cgiDataAccess);
-
-        /**
-         * Load Controlled Concept data access
-         */
-        DataAccess<FeatureType, Feature> ccDataAccess = DataAccessRegistry
-                .getDataAccess(CONTROLLED_CONCEPT);
-        assertNotNull(ccDataAccess);
-
         cpFeatures = new ArrayList<Feature>();
         while (cpIterator.hasNext()) {
             cpFeatures.add(cpIterator.next());
         }
         cpCollection.close(cpIterator);
-
-        ccDataAccess.dispose();
     }
 
     /**

Modified: trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/GeologicUnitTest.java
===================================================================
--- trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/GeologicUnitTest.java 2009-07-08 04:14:53 UTC (rev 33523)
+++ trunk/modules/unsupported/app-schema/app-schema/src/test/java/org/geotools/data/complex/GeologicUnitTest.java 2009-07-08 05:12:20 UTC (rev 33524)
@@ -147,29 +147,6 @@
         FeatureType geologicUnitType = guDataStore.getSchema(FeatureChainingTest.GEOLOGIC_UNIT);
         assertNotNull(geologicUnitType);
 
-        url = getClass().getResource(schemaBase + "CompositionPart.xml");
-        assertNotNull(url);
-        dsParams.put("url", url.toExternalForm());
-        DataAccess cpDataStore = DataAccessFinder.getDataStore(dsParams);
-        assertNotNull(cpDataStore);
-        FeatureType cpType = cpDataStore.getSchema(FeatureChainingTest.COMPOSITION_PART);
-        assertNotNull(cpType);
-
-        url = getClass().getResource(schemaBase + "CGITermValue.xml");
-        assertNotNull(url);
-        dsParams.put("url", url.toExternalForm());
-        DataAccess cgiDataAccess = DataAccessFinder.getDataStore(dsParams);
-        assertNotNull(cgiDataAccess);
-        FeatureType cgiType = cgiDataAccess.getSchema(FeatureChainingTest.CGI_TERM_VALUE);
-        assertNotNull(cgiType);
-
-        url = getClass().getResource(schemaBase + "ControlledConcept.xml");
-        assertNotNull(url);
-
-        dsParams.put("url", url.toExternalForm());
-        DataAccess ccDataAccess = DataAccessFinder.getDataStore(dsParams);
-        assertNotNull(ccDataAccess);
-        
         url = getClass().getResource(schemaBase + "MappedFeaturePropertyfile.xml");
         assertNotNull(url);
 
@@ -194,7 +171,7 @@
         /*
          * Make sure there are 3 compositional part features
          */
-        FeatureSource cpSource = (FeatureSource) cpDataStore
+        FeatureSource cpSource = DataAccessRegistry
                 .getFeatureSource(FeatureChainingTest.COMPOSITION_PART);
 
         FeatureCollection cpFeatures = (FeatureCollection) cpSource.getFeatures();
@@ -208,7 +185,7 @@
          */
         EXPECTED_RESULT_COUNT = 8;
 
-        FeatureSource cgiSource = (FeatureSource) cgiDataAccess
+        FeatureSource cgiSource = DataAccessRegistry
                 .getFeatureSource(FeatureChainingTest.CGI_TERM_VALUE);
         FeatureCollection cgiFeatures = (FeatureCollection) cgiSource.getFeatures();
 


------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge  
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize  
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
GeoTools-commits mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geotools-commits