db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r594169 - in /db/derby/code/trunk: ./ java/testing/ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/engine/
Date Mon, 12 Nov 2007 15:07:53 GMT
Author: kahatlen
Date: Mon Nov 12 07:07:52 2007
New Revision: 594169

URL: http://svn.apache.org/viewvc?rev=594169&view=rev
Log:
DERBY-3156: Convert testing of derby error stream to JUnit

Contributed by Vemund Østgaard.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
  (with props)
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
  (with props)
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
  (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/testing/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=594169&r1=594168&r2=594169&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon Nov 12 07:07:52 2007
@@ -1811,6 +1811,8 @@
 	todir="junit_${derby.junit.timestamp}"/>
 <test name="org.apache.derbyTesting.functionTests.tests.store._Suite"
 	todir="junit_${derby.junit.timestamp}"/>
+<test name="org.apache.derbyTesting.functionTests.tests.engine._Suite"
+	todir="junit_${derby.junit.timestamp}"/>
 <test name="org.apache.derbyTesting.functionTests.tests.upgradeTests._Suite"
   	todir="junit_${derby.junit.timestamp}"/>
 <test name="org.apache.derbyTesting.functionTests.suites.EncryptionSuite"

Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/build.xml?rev=594169&r1=594168&r2=594169&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Mon Nov 12 07:07:52 2007
@@ -66,6 +66,7 @@
     <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbcapi"/>

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

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

+    <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/engine"/>
     <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"/>


Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?rev=594169&r1=594168&r2=594169&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
Mon Nov 12 07:07:52 2007
@@ -56,6 +56,7 @@
         suite.addTest(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.store._Suite.suite());
 	 suite.addTest(org.apache.derbyTesting.functionTests.tests.tools._Suite.suite());
+        suite.addTest(org.apache.derbyTesting.functionTests.tests.engine._Suite.suite());
 
         // Suites that are compiled using Java SE 6 target need to
         // be added this way, otherwise creating the suite

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?rev=594169&r1=594168&r2=594169&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
Mon Nov 12 07:07:52 2007
@@ -21,7 +21,6 @@
 lang/desc_index.sql
 lang/dropTable.sql
 lang/emptyStatistics.sql
-lang/errorStream.java
 lang/fk_nonSPS.sql
 lang/holdCursorIJ.sql
 lang/inbetween.sql
@@ -30,7 +29,6 @@
 lang/joinDeadlock.sql
 lang/langUnitTests.sql
 lang/lockTable.sql
-lang/logStream.java
 lang/lojreorder.sql
 lang/maxMemPerTab.java
 lang/nestedCommit.sql

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java?rev=594169&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
Mon Nov 12 07:07:52 2007
@@ -0,0 +1,560 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.engine.ErrorStreamTest
+
+   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.engine;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.sql.SQLException;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.NetworkServerTestSetup;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+
+/**
+ * Tests related to the Derby error stream.
+ *
+ * This test has been converted to junit from the old harness tests
+ * logStream.java and errorStream.java. The testDefault method is based on
+ * logStream.java, the other test* methods are from errorStream.java.
+ */
+public class ErrorStreamTest extends BaseJDBCTestCase {
+
+    private static final String FILE_PROP   = "derby.stream.error.file";
+    private static final String METHOD_PROP = "derby.stream.error.method";
+    private static final String FIELD_PROP  = "derby.stream.error.field";
+
+    /**
+     * runNo keeps track of which run we are in to generate unique (within a
+     * JUnit run) names for files that are used in the test. Has to be static.
+     */
+    private static int runNo = 0;
+
+    /**
+     * File used when FILE_PROP is set, it maps to file
+     * <database>-file-<runNo>.log
+     */
+    private File fileStreamFile;
+
+    /**
+     * See doc for getStream() below. Has to be static.
+     */
+    private static OutputStream methodStream;
+    private File methodStreamFile;
+
+    /**
+     * Field fieldStream used by Derby when FIELD_PROP is set,
+     * so it needs to be public and static.
+     * Maps to file <database>-field-<runNo>.log
+     */
+    public static OutputStream fieldStream;
+    private File fieldStreamFile;
+
+    /**
+     * Field errStream used as redirection for System.err to be able
+     * to checks its (non-)use in the scenarios. We first tried to
+     * merge it with System.out and let the harness compare outputs,
+     * but this gave intermittent merging differences, so abandoned.
+     * Maps to file <database>-err-<runNo>.log
+     */
+    private OutputStream errStream;
+    private File errStreamFile;
+
+    public ErrorStreamTest(String name) {
+        super(name);
+    }
+
+    public static Test suite() {
+        return TestConfiguration.embeddedSuite(ErrorStreamTest.class);
+    }
+
+    public void setUp() throws Exception {
+        openStreams();
+    }
+
+    public void tearDown() throws Exception {
+        resetProps();
+        deleteStreamFiles();
+        nullFields();
+    }
+
+    /**
+     * Test that the error stream file (derby.log) is created at database boot
+     * and not deleted when the database is shut down, but can be deleted
+     * afterwards.
+     */
+    public void testDefault() throws IOException, SQLException {
+        File derbyLog = new File(getSystemProperty("derby.system.home"),
+              "derby.log");
+        bootDerby();
+        assertIsExisting(derbyLog);
+        assertNotDirectory(derbyLog);
+        assertNotEmpty(derbyLog);
+
+        println("Shutdown database");
+        getTestConfiguration().shutdownDatabase();
+
+        assertIsExisting(derbyLog);
+        assertNotDirectory(derbyLog);
+        assertNotEmpty(derbyLog);
+
+        boolean deleted = deleteFile(derbyLog);
+        assertTrue("File " + derbyLog + " could not be deleted", deleted);
+
+        println("Shutdown engine");
+        getTestConfiguration().shutdownEngine();
+    }
+
+    /**
+     * Test the derby.stream.error.file property.
+     */
+    public void testFile() throws IOException, SQLException {
+        setSystemProperty(FILE_PROP, fileStreamFile.getCanonicalPath());
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotEmpty(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Test the derby.stream.error.file property with wrong input.
+     */
+    public void testWrongFile() throws IOException, SQLException {
+        setSystemProperty(FILE_PROP,
+              new File(new File(getSystemProperty("derby.system.home"), "foo"),
+              makeStreamFilename("file")).getCanonicalPath()); // erroneous path
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotExisting(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertNotEmpty(errStreamFile);
+    }
+
+    /**
+     * Test the derby.stream.error.method property.
+     */
+    public void testMethod() throws IOException, SQLException  {
+        setSystemProperty(METHOD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.getStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotExisting(fileStreamFile);
+        assertNotEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Test the derby.stream.error.method property with wrong input.
+     */
+    public void testWrongMethod() throws IOException, SQLException {
+        setSystemProperty(METHOD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.nonExistingGetStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotExisting(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertNotEmpty(errStreamFile);
+    }
+
+    /**
+     * Test the derby.stream.error.field property.
+     */
+    public void testField() throws IOException, SQLException {
+        setSystemProperty(FIELD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.fieldStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotExisting(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertNotEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Test the derby.stream.error.field property with wrong input.
+     */
+    public void testWrongField() throws IOException, SQLException {
+        setSystemProperty(FIELD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.nonExistingFieldStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotExisting(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertNotEmpty(errStreamFile);
+    }
+
+    /**
+     * Test that the derby.stream.error.file property overrides the
+     * derby.stream.error.method property.
+     */
+    public void testFileOverMethod() throws IOException, SQLException {
+        setSystemProperty(FILE_PROP, fileStreamFile.getCanonicalPath());
+        setSystemProperty(METHOD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.getStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotEmpty(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Test that the derby.stream.error.file property overrides the
+     * derby.stream.error.field property.
+     */
+    public void testFileOverField() throws IOException, SQLException {
+        setSystemProperty(FILE_PROP, fileStreamFile.getCanonicalPath());
+        setSystemProperty(FIELD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.fieldStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotEmpty(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Test that the derby.stream.error.file property overrides the
+     * derby.stream.error.method and the derby.stream.error.field property.
+     */
+    public void testFileOverMethodAndField() throws IOException, SQLException {
+        setSystemProperty(FILE_PROP, fileStreamFile.getCanonicalPath());
+        setSystemProperty(METHOD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.getStream");
+        setSystemProperty(FIELD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.fieldStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotEmpty(fileStreamFile);
+        assertIsEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Test that the derby.stream.error.field property overrides the
+     * derby.stream.error.method property.
+     */
+    public void testMethodOverField() throws IOException, SQLException {
+
+        setSystemProperty(METHOD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.getStream");
+        setSystemProperty(FIELD_PROP,
+              "org.apache.derbyTesting.functionTests.tests.engine."+
+              "ErrorStreamTest.fieldStream");
+
+        bootDerby();
+        getTestConfiguration().shutdownEngine();
+
+        closeStreams();
+
+        assertNotExisting(fileStreamFile);
+        assertNotEmpty(methodStreamFile);
+        assertIsEmpty(fieldStreamFile);
+        assertIsEmpty(errStreamFile);
+    }
+
+    /**
+     * Method getStream used by Derby when derby.stream.error.method
+     * is set.  Maps to file <database>-method-<runNo>.log
+     * This method has to be static.
+     */
+    public static OutputStream getStream() {
+        return methodStream;
+    }
+
+    private static String makeStreamFilename(String type) {
+        return type + "-" + runNo + ".log";
+    }
+
+    private void openStreams() throws IOException{
+        String systemHome = getSystemProperty("derby.system.home");
+        makeDirIfNotExisting(systemHome);
+
+        runNo += 1;
+
+        methodStreamFile = new File(systemHome, makeStreamFilename("method"));
+        fileStreamFile = new File(systemHome, makeStreamFilename("file"));
+        fieldStreamFile = new File(systemHome, makeStreamFilename("field"));
+        errStreamFile = new File(systemHome, makeStreamFilename("err"));
+
+        methodStream = newFileOutputStream(methodStreamFile);
+        fieldStream = newFileOutputStream(fieldStreamFile);
+        errStream = newFileOutputStream(errStreamFile);
+
+        setSystemErr(new PrintStream(errStream));
+
+    }
+
+
+    private void closeStreams() throws IOException {
+        try {
+            methodStream.close();
+            fieldStream.close();
+            errStream.close();
+
+            // reset until next scenario, no expected output
+            setSystemErr(System.out);
+        } catch (IOException e) {
+            println("Could not close stream files");
+            throw e;
+        }
+    }
+
+
+    private static void assertIsDirectory(final File f) throws IOException {
+        try {
+            AccessController.doPrivileged (new PrivilegedExceptionAction() {
+                public Object run() throws IOException {
+                    assertTrue("assertIsDirectory failed: " +
+                          f.getCanonicalPath(), f.isDirectory());
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            // e.getException() should be an instance of IOException.
+            throw (IOException) e.getException();
+        }
+    }
+
+    private static void assertNotDirectory(final File f) throws IOException {
+        try {
+            AccessController.doPrivileged (new PrivilegedExceptionAction() {
+                public Object run() throws IOException {
+                    assertFalse("assertNotDirectory failed: " +
+                          f.getCanonicalPath(), f.isDirectory());
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            // e.getException() should be an instance of IOException.
+            throw (IOException) e.getException();
+        }
+    }
+
+    private static void assertIsEmpty(final File f) throws IOException {
+        try {
+            AccessController.doPrivileged (new PrivilegedExceptionAction() {
+                public Object run() throws IOException {
+                    assertTrue("assertIsEmpty failed: " + f.getCanonicalPath(),
+                          (f.exists() && (f.length() == 0)));
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            // e.getException() should be an instance of IOException.
+            throw (IOException) e.getException();
+        }
+    }
+
+
+    private static void assertNotEmpty(final File f) throws IOException {
+        try {
+            AccessController.doPrivileged (new PrivilegedExceptionAction() {
+                public Object run() throws IOException {
+                    assertTrue("assertNotEmpty failed:" + f.getCanonicalPath(),
+                          f.exists() && (f.length() != 0));
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            // e.getException() should be an instance of IOException.
+            throw (IOException) e.getException();
+        }
+    }
+
+    private static void assertIsExisting(final File f) throws IOException {
+        try {
+            AccessController.doPrivileged (new PrivilegedExceptionAction() {
+                public Object run() throws IOException {
+                    assertTrue("assertIsExisting failed: " +
+                          f.getCanonicalPath(), f.exists());
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            // e.getException() should be an instance of IOException.
+            throw (IOException) e.getException();
+        }
+    }
+
+
+    private static void assertNotExisting(final File f) throws IOException {
+        try {
+            AccessController.doPrivileged (new PrivilegedExceptionAction() {
+                public Object run() throws IOException {
+                    assertFalse("assertNotExisting failed: " +
+                          f.getCanonicalPath(), f.exists());
+                    return null;
+                }
+            });
+        } catch (PrivilegedActionException e) {
+            // e.getException() should be an instance of IOException.
+            throw (IOException) e.getException();
+        }
+    }
+
+    private static boolean deleteFile(final File f) {
+        Boolean deleted = (Boolean) AccessController.doPrivileged(
+              new PrivilegedAction() {
+            public Object run() {
+                return new Boolean(f.delete());
+            }
+        });
+        return deleted.booleanValue();
+    }
+
+    private static void makeDirIfNotExisting(final String filename) {
+        AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+                File f = new File(filename);
+                if(!f.exists()) {
+                    f.mkdir();
+                }
+                return null;
+            }
+        });
+    }
+
+    private static void setSystemErr(final PrintStream err) {
+        AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+                System.setErr(err);
+                return null;
+            }
+        });
+    }
+
+    private static FileOutputStream newFileOutputStream(final File f)
+    throws FileNotFoundException {
+        FileOutputStream outStream = null;
+        try {
+            outStream = (FileOutputStream) AccessController.doPrivileged(
+                  new PrivilegedExceptionAction() {
+                public Object run() throws FileNotFoundException {
+                    return new FileOutputStream(f);
+                }
+            });
+            } catch (PrivilegedActionException e) {
+                // e.getException() should be an instance of IOException.
+                throw (FileNotFoundException) e.getException();
+            }
+        return outStream;
+    }
+
+
+    private static void resetProps() {
+        removeSystemProperty(FILE_PROP);
+        removeSystemProperty(METHOD_PROP);
+        removeSystemProperty(FIELD_PROP);
+    }
+
+    private void deleteStreamFiles() {
+        deleteFile(fileStreamFile);
+        deleteFile(methodStreamFile);
+        deleteFile(fieldStreamFile);
+        deleteFile(errStreamFile);
+    }
+
+    private void nullFields() {
+        // Nulling fields to let objects be gc'd
+        fileStreamFile = null;
+        methodStreamFile = null;
+        fieldStreamFile = null;
+        errStreamFile = null;
+        methodStream = null;
+        fieldStream = null;
+        errStream = null;
+    }
+
+
+    private void bootDerby() throws SQLException {
+        /* Connect to the database to make sure that the
+         * JDBC Driver class is loaded
+         */
+        getConnection();
+        getConnection().close();
+    }
+
+}

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java?rev=594169&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
Mon Nov 12 07:07:52 2007
@@ -0,0 +1,53 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.engine._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.engine;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.derbyTesting.junit.BaseTestCase;
+
+/**
+ * Suite to run all JUnit tests in this package:
+ * org.apache.derbyTesting.functionTests.tests.engine
+ * <P>
+ * All tests are run "as-is", just as if they were run
+ * individually. Thus this test is just a collection
+ * of all the JUnit tests in this package (excluding itself).
+ *
+ */
+public class _Suite extends BaseTestCase  {
+
+    /**
+     * Use suite method instead.
+     */
+    private _Suite(String name) {
+        super(name);
+    }
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite("engine");
+
+        suite.addTest(ErrorStreamTest.suite());
+
+        return suite;
+    }
+}

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml?rev=594169&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
Mon Nov 12 07:07:52 2007
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+
+<!-- ==================================================================== -->
+<!--                       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/engine"/>
+
+<!--             ============ Begin Targets ==============                -->
+
+  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
+
+  <!-- mkdir / init target may not be necessary, just here for reference... -->
+  <target name="init">
+    <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/engine"/>
+  </target>
+
+  <target name="compilet1" >
+     <javac
+        source="1.4"
+        target="1.4"
+        bootclasspath="${empty}"
+        nowarn="on"
+        debug="true"
+        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}/*.java"/>
+     </javac>
+  </target>
+
+  <target name="copyfiles">
+    <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/engine">
+      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/engine"
+        includes="*.sql,*.properties,*.subsql,*.policy,*.jar,*.tstlog,xmlTestFiles/*"/>
+    </copy>
+  </target>
+
+<!--             ============= End Targets ==============                -->
+
+<!--             ============= End Project ==============                -->
+
+</project>
+

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



Mime
View raw message