You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2018/09/24 13:11:08 UTC
svn commit: r1841845 - in
/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests:
derbynet/GetCurrentPropertiesTest.java replicationTests/ReplicationRun.java
Author: rhillegas
Date: Mon Sep 24 13:11:08 2018
New Revision: 1841845
URL: http://svn.apache.org/viewvc?rev=1841845&view=rev
Log:
DERBY-6945: Run JUnit All suite with a module path; commit derby-6945-59-ab-runAllSuiteWithModulePath.diff.
Modified:
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java?rev=1841845&r1=1841844&r2=1841845&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java Mon Sep 24 13:11:08 2018
@@ -163,9 +163,12 @@ public class GetCurrentPropertiesTest ex
//for debug
println(expectedValues.getProperty(propName));
println(propVal);
- assertEquals(expectedValues.getProperty(propName), propVal);
-
-
+ assertEquals
+ (
+ "Unexpected value for property " + propName,
+ expectedValues.getProperty(propName),
+ propVal
+ );
}
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java?rev=1841845&r1=1841844&r2=1841845&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java Mon Sep 24 13:11:08 2018
@@ -31,8 +31,11 @@ import java.util.Properties;
import java.sql.*;
import java.io.*;
+import org.apache.derby.jdbc.ClientDriver;
import org.apache.derby.client.ClientDataSourceInterface;
+import org.apache.derby.shared.common.info.JVMInfo;
+import org.apache.derby.shared.common.reference.ModuleUtil;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.BaseTestCase;
import org.apache.derbyTesting.junit.JDBC;
@@ -890,7 +893,11 @@ public class ReplicationRun extends Base
{
util.DEBUG("bootMasterDatabase getConnection("+URL+")");
- Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
+ // Needed when running from classes and also when running
+ // from the module path after the upgrade tests have unloaded
+ // the drivers.
+ DriverManager.registerDriver(new ClientDriver());
+
Connection conn = DriverManager.getConnection(URL);
conn.close();
}
@@ -2055,7 +2062,16 @@ public class ReplicationRun extends Base
ceArray.add( serverClassPath );
}
ceArray.add( "-Dderby.infolog.append=true" );
- ceArray.add( networkServerControl );
+
+ if (JVMInfo.isModuleAware())
+ {
+ ceArray.add("-m");
+ ceArray.add(ModuleUtil.SERVER_MODULE_NAME + "/" + networkServerControl);
+ }
+ else
+ {
+ ceArray.add( networkServerControl );
+ }
ceArray.add( "shutdown" );
ceArray.add( "-h" );
ceArray.add( serverHost ); // FIXME! interfacesToListenOn