Author: [log in to unmask]
Date: Tue Apr 21 16:11:31 2015
New Revision: 2776
Log:
Fix up collection ID test.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/trunk/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Tue Apr 21 16:11:31 2015
@@ -305,13 +305,9 @@
}
statement.setDate(3, new java.sql.Date(Calendar.getInstance().getTime().getTime()));
final boolean result = statement.execute();
- if (result) {
- resultSet = statement.getGeneratedKeys();
- resultSet.next();
- collectionId = resultSet.getInt(1);
- } else {
- throw new RuntimeException("Error executing prepared statement.");
- }
+ resultSet = statement.getGeneratedKeys();
+ resultSet.next();
+ collectionId = resultSet.getInt(1);
} finally {
if (resultSet != null) {
resultSet.close();
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java Tue Apr 21 16:11:31 2015
@@ -25,6 +25,7 @@
@Override
public void setUp() {
this.manager = DatabaseConditionsManager.getInstance();
+ this.manager.setConnectionResource("/org/hps/conditions/config/jeremym_dev_connection.prop");
this.manager.openConnection();
}
|