You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2012/08/02 12:16:55 UTC
svn commit: r1368406 - in
/karaf/trunk/main/src/test/java/org/apache/karaf/main/lock:
PostgreSQLJDBCLockIntegrationTest.java PostgreSQLJDBCLockTest.java
Author: jgoodyear
Date: Thu Aug 2 10:16:54 2012
New Revision: 1368406
URL: http://svn.apache.org/viewvc?rev=1368406&view=rev
Log:
[KARAF-447] Add JDBC lock implementation for PostgreSQL
Update to tests.
Modified:
karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockIntegrationTest.java
karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockTest.java
Modified: karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockIntegrationTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockIntegrationTest.java?rev=1368406&r1=1368405&r2=1368406&view=diff
==============================================================================
--- karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockIntegrationTest.java (original)
+++ karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockIntegrationTest.java Thu Aug 2 10:16:54 2012
@@ -35,7 +35,7 @@ public class PostgreSQLJDBCLockIntegrati
public void setUp() throws Exception {
password = "secret";
driver = "org.postgresql.Driver";
- url = "jdbc:derby://127.0.0.1:5432/test";
+ url = "jdbc:postgresql://127.0.0.1:5432/test";
super.setUp();
}
@@ -48,7 +48,7 @@ public class PostgreSQLJDBCLockIntegrati
@Test
public void initShouldCreateTheDatabaseIfItNotExists() throws Exception {
String database = "test" + System.currentTimeMillis();
- url = "jdbc:derby://127.0.0.1:5432/" + database;
+ url = "jdbc:postgresql://127.0.0.1:5432/" + database;
props.put("karaf.lock.jdbc.url", url);
lock = createLock(props);
lock.lock();
Modified: karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockTest.java?rev=1368406&r1=1368405&r2=1368406&view=diff
==============================================================================
--- karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockTest.java (original)
+++ karaf/trunk/main/src/test/java/org/apache/karaf/main/lock/PostgreSQLJDBCLockTest.java Thu Aug 2 10:16:54 2012
@@ -38,7 +38,7 @@ public class PostgreSQLJDBCLockTest exte
public void setUp() throws Exception {
password = "secret";
driver = "org.postgresql.Driver";
- url = "jdbc:derby://127.0.0.1:5432/test";
+ url = "jdbc:postgresql://127.0.0.1:5432/test";
super.setUp();
}
@@ -48,7 +48,7 @@ public class PostgreSQLJDBCLockTest exte
@Override
Connection doCreateConnection(String driver, String url, String username, String password) {
assertEquals(this.driver, driver);
- assertEquals(this.url + ";create=true", url);
+ assertEquals(this.url, url);
assertEquals(this.user, username);
assertEquals(this.password, password);
return connection;
@@ -69,7 +69,7 @@ public class PostgreSQLJDBCLockTest exte
@Override
Connection doCreateConnection(String driver, String url, String username, String password) {
assertEquals(this.driver, driver);
- assertEquals(this.url + ";create=true", url);
+ assertEquals(this.url, url);
assertEquals(this.user, username);
assertEquals(this.password, password);
return connection;