You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/05/04 14:31:45 UTC
svn commit: r535207 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test:
java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java
resources/dbcp.driver.properties
Author: aadamchik
Date: Fri May 4 05:31:44 2007
New Revision: 535207
URL: http://svn.apache.org/viewvc?view=rev&rev=535207
Log:
CAY-785 Cayenne Modeler Fails to Open Project
(tests that demonstrate that DBCPDataSourceProperties actually does the right thing)
Added:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/resources/dbcp.driver.properties
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java?view=diff&rev=535207&r1=535206&r2=535207
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java Fri May 4 05:31:44 2007
@@ -44,6 +44,14 @@
Properties props2 = DBCPDataSourceProperties.loadProperties(locator, "dbcp.properties");
assertNotNull(props2);
assertEquals("a", props2.get("b"));
+
+ Properties props3 = DBCPDataSourceProperties.loadProperties(locator, "dbcp.driver");
+ assertNotNull(props3);
+ assertEquals("d", props3.get("c"));
+
+ Properties props4 = DBCPDataSourceProperties.loadProperties(locator, "dbcp.driver.properties");
+ assertNotNull(props4);
+ assertEquals("d", props4.get("c"));
}
public void testStringProperty() {
Added: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/resources/dbcp.driver.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/resources/dbcp.driver.properties?view=auto&rev=535207
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/resources/dbcp.driver.properties (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/resources/dbcp.driver.properties Fri May 4 05:31:44 2007
@@ -0,0 +1 @@
+c=d
\ No newline at end of file