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 fu...@apache.org on 2007/03/23 03:31:39 UTC

svn commit: r521558 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: suites/derbynetmats.runall tests/derbynet/NetHarnessJavaTest.java

Author: fuzzylogic
Date: Thu Mar 22 19:31:37 2007
New Revision: 521558

URL: http://svn.apache.org/viewvc?view=rev&rev=521558
Log:
DERBY-2348: Move testProtocol.java back to running in the old harness
due to differences in output on IBM JVMs

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?view=diff&rev=521558&r1=521557&r2=521558
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall Thu Mar 22 19:31:37 2007
@@ -9,6 +9,7 @@
 derbynet/runtimeinfo.java
 derbynet/sysinfo.java
 derbynet/sysinfo_withproperties.java
+derbynet/testProtocol.java
 derbynet/testProperties.java
 derbynet/testconnection.java
 derbynet/testij.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java?view=diff&rev=521558&r1=521557&r2=521558
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java Thu Mar 22 19:31:37 2007
@@ -78,9 +78,16 @@
         suite.addTest(TestConfiguration.clientServerDecorator(
         		         decorate(new NetHarnessJavaTest("executeUpdate"))));
 
-        suite.addTest(TestConfiguration.clientServerDecorator(
-        		         SecurityManagerSetup.noSecurityManager(
-        		             decorate(new NetHarnessJavaTest("testProtocol")))));
+        //DERBY-2348: SECMEC 9 is available on IBM 1.4.2 and 1.5 VMs, leading
+        //            to differences in output, disabling for now. While tests
+        //            for security mechanism exist in NSSecurityMechanismTest,
+        //            that test does not currently check the correct order of
+        //            responses of secmec and secchkcd for various error cases,
+        //            which is tested in testProtocol.
+        //            
+        //suite.addTest(TestConfiguration.clientServerDecorator(
+        //		         SecurityManagerSetup.noSecurityManager(
+        //		             decorate(new NetHarnessJavaTest("testProtocol")))));
 
         // Server does not run on J2ME
         if (JDBC.vmSupportsJDBC3()) {