[PATCH] Make JitTest.java independent of Derby release (related to checkin 413411 by Andrew)

[Mamta Satoor]

Hi,

 

I noticed that Andrew had to recently make a checkin # 413411 because JitTest.java prints out Derby version, name and driver name. In order to make the test output independent of Derby releases, I have changed the test to not display Derby version specific info. The patch for that change is attached to this mail and it is for the main codeline. If it looks good, then can a commiter please commit this change and merge the test and master changes to Derby 10.1 release as well?

 

svn stat

M      java\testing\org\apache\derbyTesting\functionTests\tests\lang\JitTest.java
M      java\testing\org\apache\derbyTesting\functionTests\master\JitTest.out
M      tools\release\build.xml

 

thanks,

Mamta

Index: 
java/testing/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java  
(revision 414439)
+++ java/testing/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java  
(working copy)
@@ -46,6 +46,7 @@
        ij.getPropertyArg(args);
        Connection conn = ij.startJBMS();
 
+       System.out.println("Start JitTest");
        //add tests specific to a jit issue
        testDerby1327BadStartWithForAutoIncColumn(conn);
        conn.close();
@@ -69,10 +70,6 @@
        conn.setAutoCommit(false);
                Statement stmt = null;          
 
-               DatabaseMetaData md = conn.getMetaData() ;
-               System.out.println(md.getDatabaseProductVersion());
-               System.out.println(md.getDatabaseProductName());
-               System.out.println(md.getDriverName());
                dropAllAppTables(conn);
                System.out.println("Create tables until we get a wrong Start 
with value");
                stmt = conn.createStatement();
Index: java/testing/org/apache/derbyTesting/functionTests/master/JitTest.out
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/master/JitTest.out       
(revision 414439)
+++ java/testing/org/apache/derbyTesting/functionTests/master/JitTest.out       
(working copy)
@@ -1,6 +1,4 @@
-10.2.0.4 alpha
-Apache Derby
-Apache Derby Embedded JDBC Driver
+Start JitTest
 Drop all tables in APP schema
 Create tables until we get a wrong Start with value
 PASS: All 200 tables created without problems
Index: tools/release/build.xml
===================================================================
--- tools/release/build.xml     (revision 414439)
+++ tools/release/build.xml     (working copy)
@@ -301,9 +301,6 @@
     <antcall target="regex.version"> 
       <param name="regex.file" 
value="java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out"/>
     </antcall>
-    <antcall target="regex.version"> 
-      <param name="regex.file" 
value="java/testing/org/apache/derbyTesting/functionTests/master/JitTest.out"/>
-    </antcall>
   </target>
 
   <target name="regex.version">