db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r521949 - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/TestProto.java testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol.java
Date Sat, 24 Mar 2007 00:12:17 GMT
Author: fuzzylogic
Date: Fri Mar 23 17:12:16 2007
New Revision: 521949

URL: http://svn.apache.org/viewvc?view=rev&rev=521949
Log:
DERBY-2348: Put testProtocol.java back in the old harness for now.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
    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/testProtocol.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java?view=diff&rev=521949&r1=521948&r2=521949
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java Fri Mar 23 17:12:16
2007
@@ -189,7 +189,7 @@
 			// the location is different, try it
 			String userdir =  System.getProperty("user.dir");
 			String sep =  System.getProperty("file.separator");
-			fr = new BufferedReader (new InputStreamReader(new FileInputStream(userdir + sep + "extin"
+ sep + filename),"UTF-8"));
+			fr = new BufferedReader (new InputStreamReader(new FileInputStream(userdir + sep + filename),"UTF-8"));
 		}
 		tkn = new StreamTokenizer(fr);
 		int val;

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=521949&r1=521948&r2=521949
==============================================================================
--- 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
Fri Mar 23 17:12:16 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/testProtocol.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol.java?view=diff&rev=521949&r1=521948&r2=521949
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol.java
Fri Mar 23 17:12:16 2007
@@ -22,7 +22,8 @@
 package org.apache.derbyTesting.functionTests.tests.derbynet;
 
 import org.apache.derby.impl.drda.TestProto;
-
+import org.apache.derbyTesting.junit.TestConfiguration;
+import java.io.File;
 
 /**
 	This tests protocol errors and protocol not used by JCC or derbyclient
@@ -30,18 +31,21 @@
 
 public class testProtocol { 
 
-	private static final String DEFAULT_FILENAME = "extin/protocol.tests";
-	
+	private static final String DEFAULT_FILENAME = "extin" + File.separator + "protocol.tests";
+	private static final String OLD_HARNESS_FILENAME = "protocol.tests";
+
 	// constructor
 	public testProtocol() {}
 	
-
 	/**
 	 * main routine
 	 */
     public static void main(String[] args) {
 		
-		executeFile(DEFAULT_FILENAME);
+    	if (TestConfiguration.runningInDerbyHarness())
+    		executeFile(OLD_HARNESS_FILENAME);
+    	else
+		    executeFile(DEFAULT_FILENAME);
 	}
 	/**
 	 * Execute a command file against a network server



Mime
View raw message