[Geotools-commits] svn - r38596 - in trunk/modules/plugin/jdbc/jdbc-oracle/src/test: java/org/geotools/data/oracle resources/org/geotools/data/oracle

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

Author: aaime
Date: 2012-03-03 03:04:54 -0800 (Sat, 03 Mar 2012)
New Revision: 38596

Removed:
   trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties
   trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties
Modified:
   trunk/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleNGDataStoreFactoryTest.java
Log:
[GEOT-4047] OracleNGDataStoreFactoryTest fails because it does not use common fixture, patch by Ben Caradoc Davies

Modified: trunk/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleNGDataStoreFactoryTest.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleNGDataStoreFactoryTest.java	2012-03-03 11:04:01 UTC (rev 38595)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/test/java/org/geotools/data/oracle/OracleNGDataStoreFactoryTest.java	2012-03-03 11:04:54 UTC (rev 38596)
@@ -31,6 +31,7 @@
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.JDBCTestSetup;
 import org.geotools.jdbc.JDBCTestSupport;
+import org.geotools.test.FixtureUtilities;
 
 /**
  * 
@@ -55,14 +56,13 @@
     }
 
     private void checkCreateConnection(OracleNGDataStoreFactory factory, String dbtype) throws IOException {
-        Properties db = new Properties();
-        db.load(getClass().getResourceAsStream("factory.properties"));
+        Properties db = FixtureUtilities.loadFixture("oracle");
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(HOST.key, db.getProperty(HOST.key));
         params.put(DATABASE.key, db.getProperty(DATABASE.key));
         params.put(PORT.key, db.getProperty(PORT.key));
         params.put(USER.key, db.getProperty(USER.key));
-        params.put(PASSWD.key, db.getProperty(PASSWD.key));
+        params.put(PASSWD.key, db.getProperty("password"));
         
         params.put(DBTYPE.key, dbtype);
 

Deleted: trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties	2012-03-03 11:04:01 UTC (rev 38595)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/db.properties	2012-03-03 11:04:54 UTC (rev 38596)
@@ -1,4 +0,0 @@
-driver=oracle.jdbc.driver.OracleDriver
-url=jdbc:oracle:thin:@localhost:1521:xe
-username=geoserver
-password=postgis

Deleted: trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties	2012-03-03 11:04:01 UTC (rev 38595)
+++ trunk/modules/plugin/jdbc/jdbc-oracle/src/test/resources/org/geotools/data/oracle/factory.properties	2012-03-03 11:04:54 UTC (rev 38596)
@@ -1,7 +0,0 @@
-driver=oracle.jdbc.driver.OracleDriver
-host=localhost
-port=1521
-database=xe
-user=geoserver
-passwd=postgis
-dbtype=Oracle