db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r432479 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: jdbc4/_Suite.java lang/_Suite.java lang/build.xml
Date Fri, 18 Aug 2006 03:43:53 GMT
Author: djd
Date: Thu Aug 17 20:43:52 2006
New Revision: 432479

URL: http://svn.apache.org/viewvc?rev=432479&view=rev
Log:
Add a couple _Suite JUnit suites in lang and jdbc4, as framework, neither is used yet.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
  (with props)
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
  (with props)
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java?rev=432479&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
Thu Aug 17 20:43:52 2006
@@ -0,0 +1,70 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite
+
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License
+*/
+package org.apache.derbyTesting.functionTests.tests.jdbc4;
+
+import java.sql.SQLException;
+
+import org.apache.derbyTesting.functionTests.util.BaseTestCase;
+import junit.framework.Test; 
+import junit.framework.TestSuite;
+
+/**
+ * Suite to run all JUnit tests in this package:
+ * org.apache.derbyTesting.functionTests.tests.jdbc4
+ *
+ */
+public class _Suite extends BaseTestCase  {
+
+	/**
+	 * Use suite method instead.
+	 */
+	private _Suite(String name) {
+		super(name);
+	}
+
+	public static Test suite() throws SQLException {
+
+		TestSuite suite = new TestSuite();
+
+		//suite.addTestSuite(AutoloadBooting.class);
+		//suite.addTestSuite(AutoloadTest.class);
+		suite.addTest(BlobTest.suite());
+		suite.addTest(CallableStatementTest.suite());
+		suite.addTest(ClobTest.suite());
+		suite.addTest(ClosedObjectTest.suite());
+		suite.addTest(ConnectionTest.suite());
+		suite.addTest(DataSourceTest.suite());
+		suite.addTestSuite(JDBC40TranslationTest.class);	
+		suite.addTest(ParameterMetaDataWrapperTest.suite());
+		suite.addTest(PreparedStatementTest.suite());
+		suite.addTest(ResultSetMetaDataTest.suite());
+		suite.addTest(ResultSetTest.suite());
+		suite.addTest(RowIdNotImplementedTest.suite());
+		suite.addTest(StatementEventsTest.suite());
+		suite.addTest(StatementTest.suite());
+		suite.addTestSuite(UnsupportedVetter.class);
+		suite.addTest(VerifySignatures.suite());
+		suite.addTest(XA40Test.suite());
+		
+		return suite;
+	}
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=432479&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Thu Aug 17 20:43:52 2006
@@ -0,0 +1,60 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite
+
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License
+*/
+package org.apache.derbyTesting.functionTests.tests.lang;
+
+import org.apache.derbyTesting.functionTests.util.BaseTestCase;
+import org.apache.derbyTesting.functionTests.util.JDBC;
+
+import junit.framework.Test; 
+import junit.framework.TestSuite;
+
+/**
+ * Suite to run all JUnit tests in this package:
+ * org.apache.derbyTesting.functionTests.tests.lang
+ *
+ */
+public class _Suite extends BaseTestCase  {
+
+	/**
+	 * Use suite method instead.
+	 */
+	private _Suite(String name) {
+		super(name);
+	}
+
+	public static Test suite() {
+
+		TestSuite suite = new TestSuite("lang");
+
+		// suite.addTest(PrepareExecuteDDL.suite());
+		// suite.addTest(LangScripts.suite());
+		
+		// Tests that are compiled using 1.4 target need to
+		// be added this way, otherwise creating the suite
+		// will throw an invalid class version error
+		if (JDBC.vmSupportsJDBC3() || JDBC.vmSupportsJSR169())
+		{
+		}
+
+		return suite;
+	}
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml?rev=432479&r1=432478&r2=432479&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
Thu Aug 17 20:43:52 2006
@@ -58,14 +58,14 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compilet3,compilet2,compilet1,copyfiles"/>
+  <target name="FTOtestsubdir" depends="compilett4,copyfiles"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
     <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/lang"/>
   </target>
 
-  <target name="compilet1" depends="compilet2">
+  <target name="compilet1" >
     <javac
       source="1.3"
       target="1.3"
@@ -93,9 +93,10 @@
       <exclude name="${this.dir}/procedureJdbc30.java"/>
       <exclude name="${this.dir}/SpillHash.java"/>
       <exclude name="${this.dir}/unaryArithmeticDynamicParameter.java"/>
+      <exclude name="${this.dir}/_Suite.java"/>
     </javac>
   </target>
-  <target name="compilet2" depends="compilet3">
+  <target name="compilet2" depends="compilet1">
     <javac
       source="1.3"
       target="1.3"
@@ -112,7 +113,6 @@
       <classpath>
         <pathelement path="${java14compile.classpath}"/>
       </classpath>
-      <exclude name="${this.dir}/declareGlobalTempTableJavaJDBC30.java"/>
       <include name="${this.dir}/holdCursorJavaReflection.java"/>
       <include name="${this.dir}/holdCursorJava.java"/>
       <include name="${this.dir}/streams.java"/>
@@ -122,7 +122,7 @@
       <include name="${this.dir}/unaryArithmeticDynamicParameter.java"/>
     </javac>
   </target>
-  <target name="compilet3">
+  <target name="compilet3" depends="compilet2">
     <javac
       source="1.4"
       target="1.4"
@@ -142,7 +142,31 @@
       <include name="${this.dir}/declareGlobalTempTableJavaJDBC30.java"/>
     </javac>
   </target> 
+	<!-- Compile _Suite last as it needs to include all other JUnit classes 
+	which may be compiled using a higher compiler level, but it needs to be at
+	base level -->
+	<target name="compilett4" depends="compilet3" >
+    <javac
+      source="1.3"
+      target="1.3"
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}" 
+      srcdir="${derby.testing.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${compile.classpath}"/>
+      	<pathelement path="${junit}"/>
+      </classpath>
 
+      <include name="${this.dir}/_Suite.java"/>
+    </javac>
+  </target>
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/lang">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/lang"




Mime
View raw message