db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r128388 - in incubator/derby/code/trunk: . java/testing java/testing/org/apache/derbyTesting/functionTests/master java/testing/org/apache/derbyTesting/functionTests/suites java/testing/org/apache/derbyTesting/functionTests/tests/demo
Date Thu, 27 Jan 2005 19:39:37 GMT
Author: fuzzylogic
Date: Thu Jan 27 11:39:35 2005
New Revision: 128388

URL: http://svn.apache.org/viewcvs?view=rev&rev=128388
Log:
Add demo test and suite.

Committed for Myrna Van Lunteran <myrna@golux.com>

Added:
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RunClassPathTester.out
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.properties
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.runall
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.runall
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester.java
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
Modified:
   incubator/derby/code/trunk/build.xml
   incubator/derby/code/trunk/java/testing/build.xml
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties

Modified: incubator/derby/code/trunk/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/build.xml?view=diff&rev=128388&p1=incubator/derby/code/trunk/build.xml&r1=128387&p2=incubator/derby/code/trunk/build.xml&r2=128388
==============================================================================
--- incubator/derby/code/trunk/build.xml	(original)
+++ incubator/derby/code/trunk/build.xml	Thu Jan 27 11:39:35 2005
@@ -275,7 +275,7 @@
     <ant dir="${derby.demo.src.dir}"/>
   </target>
 
-  <target name="testing">
+  <target name="testing" depends="demo">
     <ant dir="${derby.testing.src.dir}"/>
   </target>
 
@@ -974,7 +974,7 @@
 
   <target name="derbytestingjar" depends="initjars,ckderbytesting" if="derbyTesting.available">
     <zip destfile="${derby.jar.dir}/derbyTesting.jar" filesonly="true" compress="true">
-      <fileset dir="${out.dir}" includes="org/apache/derbyTesting/functionTests/**"/>
+      <fileset dir="${out.dir}" includes="org/apache/derbyTesting/functionTests/**,SimpleApp*"/>
     </zip>
   </target>
 

Modified: incubator/derby/code/trunk/java/testing/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/build.xml?view=diff&rev=128388&p1=incubator/derby/code/trunk/java/testing/build.xml&r1=128387&p2=incubator/derby/code/trunk/java/testing/build.xml&r2=128388
==============================================================================
--- incubator/derby/code/trunk/java/testing/build.xml	(original)
+++ incubator/derby/code/trunk/java/testing/build.xml	Thu Jan 27 11:39:35 2005
@@ -48,6 +48,7 @@
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/storetests"/>

     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/tools"/>

     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/nist"/>

+    <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/demo"/>

     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/derbynet"/>

     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/master"/> 
     <ant dir="${derby.testing.src.dir}/${derby.testing.suites.dir}"/> 

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RunClassPathTester.out
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RunClassPathTester.out?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RunClassPathTester.out
Thu Jan 27 11:39:35 2005
@@ -0,0 +1,4 @@
+FOUND IN CLASS PATH:
+   Derby embedded engine library (derby.jar)
+   user-specified class (SimpleApp)
+SUCCESS: All Derby related classes found in class path.

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out
Thu Jan 27 11:39:35 2005
@@ -0,0 +1,14 @@
+SimpleApp starting in embedded mode.
+Loaded the appropriate driver.
+Connected to and created database derbyDB
+Created table derbyDB
+Inserted 1956 Webster
+Inserted 1910 Union
+Updated 1956 Webster to 180 Grand
+Updated 180 Grand to 300 Lakeshore
+Verified the rows
+Dropped table derbyDB
+Closed result set and statement
+Committed transaction and closed connection
+Database shut down normally
+SimpleApp finished

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.properties
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.properties?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.properties
Thu Jan 27 11:39:35 2005
@@ -0,0 +1 @@
+suites=demo simpledemo

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.runall
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.runall?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/demo.runall
Thu Jan 27 11:39:35 2005
@@ -0,0 +1 @@
+demo/RunClassPathTester.java

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties?view=diff&rev=128388&p1=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties&r1=128387&p2=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties&r2=128388
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
Thu Jan 27 11:39:35 2005
@@ -1,3 +1,3 @@
-suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdk14 jdbcapi encryption nist
+suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdk14 jdbcapi encryption nist
demo
 derby.debug.true=enableBtreeConsistencyCheck
 derby.stream.error.logSeverityLevel=0

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties
Thu Jan 27 11:39:35 2005
@@ -0,0 +1 @@
+ij.defaultResourcePackage=/

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.runall
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.runall?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.runall
Thu Jan 27 11:39:35 2005
@@ -0,0 +1 @@
+SimpleApp.java

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester.java?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/RunClassPathTester.java
Thu Jan 27 11:39:35 2005
@@ -0,0 +1,43 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.demo.RunClassPathTester
+
+   Copyright 1999, 2005 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed 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.demo;
+
+
+/**
+ * @author janet
+ **/
+public class RunClassPathTester { 
+
+	public static void main(String args[]) {
+
+		String arg2 = "embedded";
+		String env = System.getProperty("theframework", "embedded");
+		String[] newargs = new String[3];
+		newargs[0] = "-cp";
+		newargs[1] = arg2;
+		newargs[2] = "SimpleApp.class";
+
+		org.apache.derby.tools.sysinfo.main(newargs);
+	}
+	
+	private RunClassPathTester() {} // no instances
+
+}

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml?view=auto&rev=128388
==============================================================================
--- (empty file)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
Thu Jan 27 11:39:35 2005
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+
+<!-- ==================================================================== -->
+<!--                       Derby build file                          -->
+<!-- ==================================================================== -->
+
+<project default="FTOtestsubdir" basedir="../../../../../../../.." >
+
+<!-- ==================================================================== -->
+<!--                           Set properties                             -->
+<!-- ==================================================================== -->
+
+  <!-- User settings -->
+  <property file="${user.home}/ant.properties"/>
+
+  <!-- Set property lib dir -->
+  <property name="properties.dir" value="tools/ant/properties" />
+
+  <!-- Significant dirs -->
+  <property file="${properties.dir}/dirs.properties"/>
+  <property file="${properties.dir}/derbytesting.properties"/>
+
+  <!-- Compiler settings -->
+  <property file="${properties.dir}/sane${sanity}.properties"/>
+  <property file="${properties.dir}/defaultcompiler.properties"/>
+  <property file="${properties.dir}/${build.compiler}.properties"/>
+
+  <!-- Parser properties -->
+  <!--property file="${properties.dir}/parser.properties"/-->
+
+  <!-- Compile-time classpath properties files -->
+  <property file="${properties.dir}/extrapath.properties"/>
+  <property file="${properties.dir}/compilepath.properties"/>
+
+  <!-- Release and Version info -->
+  <property file="${properties.dir}/release.properties"/>
+
+  <!-- derby testing specific properties files -->
+  <property file="${ant.home}/properties/derbytesting.properties"/>
+  <property file="${user.home}/properties/derbytesting.properties"/>
+  <property name="this.dir" value="${derby.testing.functest.dir}/tests/tools"/>
+
+<!--             ============ Begin Targets ==============                -->
+ 
+  <target name="FTOtestsubdir" depends="compile"/>
+
+  <!-- mkdir / init target may not be necessary, just here for reference... -->
+  <target name="init">
+    <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/demo"/>
+  </target>
+
+  <target name="compile">
+    <javac
+      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 location="${oro}"/-->
+        <pathelement path="${compile.classpath}"/>
+      </classpath>
+      <include name="${this.dir}/*.java"/>
+      <!--exclude name=""/-->
+    </javac>
+  </target>
+
+
+<!--             ============= End Targets ==============                -->
+
+<!--             ============= End Project ==============                -->
+
+</project>
+

Mime
View raw message