Author: kristwaa Date: Tue Apr 17 11:42:11 2012 New Revision: 1327050 URL: http://svn.apache.org/viewvc?rev=1327050&view=rev Log: DERBY-2031: Convert derbynet/testProtocol.java to JUnit Removed the files associated with the old harness test. Removed references to the hold harness test. Adjusted some comments, and removed some now deprecated code. Patch file: derby-2031-7a-old_harness_test_removal.diff Removed: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestFile.java db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol.policy db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_app.properties db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_derby.properties Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java?rev=1327050&r1=1327049&r2=1327050&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Tue Apr 17 11:42:11 2012 @@ -98,7 +98,6 @@ class DDMReader private final static boolean ADJUST_LENGTHS = true; private final static boolean NO_ADJUST_LENGTHS = false; private final static long MAX_EXTDTA_SIZE= Long.MAX_VALUE; - private static boolean internalTrace = true; // magnitude represented in an int array, used in BigDecimal conversion @@ -174,7 +173,7 @@ class DDMReader } /** * This constructor is used for testing the protocol - * It is used by TestProto to read the protocol returned by the + * It is used by ProtocolTestAdapter to read the protocol returned by the * server */ DDMReader(InputStream inputStream) @@ -184,17 +183,6 @@ class DDMReader this.inputStream = inputStream; initialize(null, null); - // turn off tracing - internalTrace = false; - } - /** - * This initializer is used for testing the protocol - * It is used by TestProto for the reader it uses - */ - protected void initialize(InputStream inputStream) - { - this.inputStream = inputStream; - initialize(null, null); } /** Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java?rev=1327050&r1=1327049&r2=1327050&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java Tue Apr 17 11:42:11 2012 @@ -231,7 +231,7 @@ class DDMWriter /** * Create DSS request object * NOTE: This is _ONLY_ used for testing the protocol - * (via the TestProto.java file in this package)! + * (via the ProtocolTestAdapter.java file in this package)! * We should never create a DSS request in normal * DRDA processing (we should only create DSS replies * and DSS objects). @@ -297,7 +297,7 @@ class DDMWriter * (which is set in beginDss) with the chaining byte that * is passed in. NOTE: This method is only used in * association with createDssRequest, and thus is for - * TESTING purposes only (via TestProto.java). No calls + * TESTING purposes only (via ProtocolTestAdpater.java). No calls * should be made to this method in normal DRDA processing * (because for normal processing, chaining must be * determined automatically based on DSS requests). Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall?rev=1327050&r1=1327049&r2=1327050&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall Tue Apr 17 11:42:11 2012 @@ -2,5 +2,4 @@ junitTests/derbyNet/CompatibilityTest.ja derbynet/dblook_test_net.java derbynet/dblook_test_net_territory.java derbynet/DerbyNetAutoStart.java -derbynet/testProtocol.java lang/wisconsin.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?rev=1327050&r1=1327049&r2=1327050&view=diff ============================================================================== --- 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 Tue Apr 17 11:42:11 2012 @@ -80,15 +80,9 @@ public class NetHarnessJavaTest extends // 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"))))); - + // which is tested in ProtocolTest. return new SupportFilesSetup(suite, new String[] { - "functionTests/tests/derbynet/protocol.tests", "functionTests/tests/derbynet/excsat_accsecrd1.inc", "functionTests/tests/derbynet/excsat_accsecrd2.inc", "functionTests/tests/derbynet/excsat_secchk.inc",