db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kathey Marsden <kmars...@Sourcery.Org>
Subject Re: [PATCH] test file updates
Date Wed, 01 Dec 2004 00:38:48 GMT
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

svn 109265 includes this patch and also adds the store and xa .sql tests
plus includes Myrna's patch for cloudscape.  The new suites are storeall
and xa. Both suites have been added to the derbyall suite.

There will be an update to the java/testing/README shortly.

Thanks

Kathey

myrnap wrote:
> Some miscellaneous minor changes to the tests - previously missed
> references to Cloudscape, added some tests that were already being run
> with derbynetmats to derbylang, plus matching master updates.
>
> Myrna
>
>
> ------------------------------------------------------------------------
>
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml	(revision
106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml	(working
copy)
> @@ -1,7 +1,7 @@
>  <?xml version="1.0"?>
>
>  <!--
==================================================================== -->
> -<!--                       Cloudscape build file
     -->
> +<!--                       Derby build file                          -->
>  <!--
==================================================================== -->
>
>  <project default="FTOtestsubdir" basedir="../../../../../../../.." >
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
(working copy)
> @@ -1,7 +1,7 @@
>  <?xml version="1.0"?>
>
>  <!--
==================================================================== -->
> -<!--                       Cloudscape build file
     -->
> +<!--                       Derby build file                          -->
>  <!--
==================================================================== -->
>
>  <project default="FTOtestsubdir" basedir="../../../../../../../.." >
> @@ -67,7 +67,6 @@
>        </classpath>
>        <include name="${this.dir}/*.java"/>
>        <exclude name="${this.dir}/declareGlobalTempTableJavaJDBC30.java"/>
> -      <exclude name="${this.dir}/jdbcBoolean.java"/>
>        <exclude name="${this.dir}/holdCursorJavaReflection.java"/>
>        <exclude name="${this.dir}/streams.java"/>
>        <exclude name="${this.dir}/procedureJdbc30.java"/>
> @@ -89,7 +88,6 @@
>          <pathelement path="${java14compile.classpath}"/>
>        </classpath>
>        <exclude name="${this.dir}/declareGlobalTempTableJavaJDBC30.java"/>
> -      <include name="${this.dir}/jdbcBoolean.java"/>
>        <include name="${this.dir}/holdCursorJavaReflection.java"/>
>        <include name="${this.dir}/streams.java"/>
>        <include name="${this.dir}/procedureJdbc30.java"/>
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/lang/refActions1.sql
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/lang/refActions1.sql
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/lang/refActions1.sql
(working copy)
> @@ -614,7 +614,7 @@
>    and e.dno = e12.dno;
>  commit;
>
> --- FOLLOWING TWO QUERIES HANG IN CLOUDSCAPE NOW ..
> +-- FOLLOWING TWO QUERIES HANG IN DERBY NOW ..
>  -- UNCOMMENT once they pass.
>  -- select * from db2test.dept where dno in (select vdno from
>  --  db2test.vempjoin12)
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
(working copy)
> @@ -1,7 +1,7 @@
>  <?xml version="1.0"?>
>
>  <!--
==================================================================== -->
> -<!--                       Cloudscape build file
     -->
> +<!--                       Derby build file                          -->
>  <!--
==================================================================== -->
>
>  <project default="FTOtestsubdir" basedir="../../../../../../../.." >
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
(working copy)
> @@ -1,9 +1,8 @@
>  #
>  # This is the default system properties file for SQL and JAVA tests.
>  #
> -# *** DO NOT PUT PROPERTIES FOR THE CLOUDSCAPE SYSTEM IN THIS FILE.
> -# *** THEY BELONG IN default_cloudscape.properties.
> -# *** SEE
http://cloudsoft/intranet/engnet/main/doc/intranet/process/testproperties.txt
> +# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.
> +# *** THEY BELONG IN default_derby.properties.
>  #
>  # This file will get handed to the test on the command line in a -p
<filename>
>  # argument.
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij_app.properties
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij_app.properties
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij_app.properties
(working copy)
> @@ -1,9 +1,8 @@
>  #
>  # This is the default system properties file for SQL and JAVA tests.
>  #
> -# *** DO NOT PUT PROPERTIES FOR THE CLOUDSCAPE SYSTEM IN THIS FILE.
> -# *** THEY BELONG IN default_cloudscape.properties.
> -# *** SEE
http://cloudsoft/intranet/engnet/main/doc/intranet/process/testproperties.txt
> +# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.
> +# *** THEY BELONG IN default_derby.properties.
>  #
>  # This file will get handed to the test on the command line in a -p
<filename>
>  # argument.
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
(working copy)
> @@ -1,7 +1,7 @@
>  <?xml version="1.0"?>
>
>  <!--
==================================================================== -->
> -<!--                       Cloudscape build file
     -->
> +<!--                       Derby build file                          -->
>  <!--
==================================================================== -->
>
>  <project default="FTOtestsubdir" basedir="../../../../../../../.." >
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
(working copy)
> @@ -33,12 +33,12 @@
>  import org.apache.derby.drda.NetworkServerControl;
>
>  /**
> -	This test tests the cloudscape.properties, system properties and
> +	This test tests the derby.properties, system properties and
>  	command line parameters to make sure the pick up settings in
>  	the correct order. Search order is:
>  	   command line parameters
>  	   System properties
> -	   cloudscape.properties
> +	   derby.properties
>  	   default
>
>  	   The command line should take precedence
> @@ -178,20 +178,20 @@
>  			 *  Test port setting priorty
>  			 ************************************************************/
>  			// derby.drda.portNumber set in derby.properties to 1528
> -			System.out.println("Testing cloudscape.properties Port 1528 ");
> +			System.out.println("Testing derby.properties Port 1528 ");
>  			Properties derbyProperties = new Properties();
>  			derbyProperties.put("derby.drda.portNumber","1528");
>  			FileOutputStream propFile = new FileOutputStream("derby.properties");
> -			derbyProperties.store(propFile,"testing cloudscape.properties");
> +			derbyProperties.store(propFile,"testing derby.properties");
>  			propFile.close();
> -			//test start no parameters - Pickup 1528 from cloudscape.properties
> +			//test start no parameters - Pickup 1528 from derby.properties
>  			derbyServerCmd("start",null);	
>  			waitForStart("1528",15000);
>  			System.out.println("Successfully Connected");
> -			//shutdown - also picks up from cloudscape.properties
> +			//shutdown - also picks up from derby.properties
>  			derbyServerCmd("shutdown",null);
>  			System.out.println("Testing System properties  Port 1529 ");
> -			//test start with system property. Overrides cloudscape.properties
> +			//test start with system property. Overrides derby.properties
>  			derbyServerCmd("start","-Dderby.drda.portNumber=1529");
>
>  			waitForStart("1529",15000);	
> Index:
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM.java
(working copy)
> @@ -33,10 +33,10 @@
>
>      public NSinSameJVM() {
>
> -        // Load the Cloudscape driver
> +        // Load the Derby driver
>          try {
>              Class.forName("com.ibm.db2.jcc.DB2Driver").newInstance();
> -            dbg("Cloudscape drivers loaded");
> +            dbg("Derby drivers loaded");
>          } catch (Exception e) {
>              e.printStackTrace();
>          }
> Index:
java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
(working copy)
> @@ -1,7 +1,7 @@
>  <?xml version="1.0"?>
>
>  <!--
==================================================================== -->
> -<!--                       Cloudscape build file
     -->
> +<!--                       Derby build file                          -->
>  <!--
==================================================================== -->
>
>  <project default="FTharness" basedir="../../../../../../.." >
> Index:
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out
(working copy)
> @@ -1,4 +1,4 @@
> -main-NSinSameJVM: Cloudscape drivers loaded
> +main-NSinSameJVM: Derby drivers loaded
>  Server is ready to accept connections on port 20000.
>  Connection number: 1.
>  main-NSinSameJVM: NetworkServer started
> Index:
java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out
(revision 0)
> +++
java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out
(revision 0)
> @@ -0,0 +1,58 @@
> +EXPECTED SHUTDOWN Derby system shutdown.
> +Checking authentication with DriverManager
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +DS connected as EDWARD
> +DS connected as FRANCES
> +DS connected as GREEK ZEUS
> +DS connected as GREEK ZEUS
> +Checking connections with DataSource
> +EXPECTED SHUTDOWN Derby system shutdown.
> +data source with no default user
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +DS connected as EDWARD
> +DS connected as FRANCES
> +DS connected as GREEK ZEUS
> +EXPECTED SHUTDOWN Derby system shutdown.
> +data source with invalid default user
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +DS connected as FRANCES
> +EXPECTED SHUTDOWN Derby system shutdown.
> +data source with valid default user
> +DS connected as EDWARD
> +DS connected as FRANCES
> +EXPECTED SHUTDOWN Derby system shutdown.
> +Checking connections with ConnectionPoolDataSource
> +ConnectionPoolDataSource with no default user
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +CP connected as EDWARD
> +CP connected as FRANCES
> +CP connected as GREEK ZEUS
> +EXPECTED SHUTDOWN Derby system shutdown.
> +ConnectionPoolDataSource with invalid default user
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +CP connected as FRANCES
> +EXPECTED SHUTDOWN Derby system shutdown.
> +ConnectionPoolDataSource with valid default user
> +CP connected as EDWARD
> +CP connected as FRANCES
> +EXPECTED SHUTDOWN Derby system shutdown.
> +Checking connections with XADataSource
> +XADataSource with no default user
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +XA connected as EDWARD
> +XA connected as FRANCES
> +XA connected as GREEK ZEUS
> +EXPECTED SHUTDOWN Derby system shutdown.
> +XADataSource with invalid default user
> +EXPECTED CONNFAIL Connection refused : Invalid authentication.
> +XA connected as FRANCES
> +EXPECTED SHUTDOWN Derby system shutdown.
> +XADataSource with valid default user
> +XA connected as EDWARD
> +XA connected as FRANCES
> +EXPECTED SHUTDOWN Derby system shutdown.
> +Completed dataSourcePermissions
> Index:
java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
(working copy)
> @@ -1,5 +1,5 @@
>  Start testProperties to test property priority
> -Testing cloudscape.properties Port 1528
> +Testing derby.properties Port 1528
>  org.apache.derby.drda.NetworkServerControl start
>  Successfully Connected
>  org.apache.derby.drda.NetworkServerControl shutdown
> Index:
java/testing/org/apache/derbyTesting/functionTests/master/refActions1.out
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/master/refActions1.out
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/master/refActions1.out
(working copy)
> @@ -1117,7 +1117,7 @@
>    and e.dno = e12.dno;
>  0 rows inserted/updated/deleted
>  ij> commit;
> -ij> -- FOLLOWING TWO QUERIES HANG IN CLOUDSCAPE NOW ..
> +ij> -- FOLLOWING TWO QUERIES HANG IN DERBY NOW ..
>  -- UNCOMMENT once they pass.
>  -- select * from db2test.dept where dno in (select vdno from
>  --  db2test.vempjoin12)
> Index:
java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
> ===================================================================
> ---
java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
(revision 106444)
> +++
java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
(working copy)
> @@ -13,6 +13,7 @@
>  lang/authorize.sql
>  lang/autoincrement.sql
>  lang/bit.sql
> +lang/bit2.sql
>  lang/bug4356.java
>  lang/bug5052rts.java
>  lang/bug5054.java
> @@ -39,6 +40,7 @@
>  lang/ddlTableLockMode.sql
>  lang/deadlockMode.java
>  lang/declareGlobalTempTableJava.java
> +lang/declareGlobalTempTableJavaJDBC30.java
>  lang/delete.sql
>  lang/depend.sql
>  lang/derived.sql
> @@ -57,6 +59,7 @@
>  lang/forupdate.sql
>  lang/functions.sql
>  lang/groupBy.sql
> +lang/holdCursorIJ.sql
>  lang/identifier.sql
>  lang/implicitConversions.sql
>  lang/inbetween.sql
> @@ -107,6 +110,7 @@
>  lang/stmtCache0.sql
>  lang/stmtCache1.sql
>  lang/stmtCache3.java
> +lang/streams.java
>  lang/stringtypes.sql
>  lang/subquery.sql
>  lang/subquery2.sql

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBrRKYG0h36bFmkocRAqQ1AJoC5GYxSP4dkbkmLJs3/Z8lA0RgsACguU1J
bg8cHqyW953a3zD87LAedNs=
=f3Xj
-----END PGP SIGNATURE-----

Mime
View raw message