I can't see a JIRA for this commit, so I'm commenting on the commit mail.
Would you mind replacing the mix of tabs and spaces with spaces only in
the newly introduced code, as I believe this is our current guidelines
for the indentation issue?
thanks,
--
Kristian
[EMAIL PROTECTED] wrote:
Author: djd
Date: Fri Feb 22 11:47:14 2008
New Revision: 630301
URL: http://svn.apache.org/viewvc?rev=630301&view=rev
Log:
Add a top-level ant target (junit-system-mini) to run a basic form of any
system tests that run under junit. This is to allow the ability to ensure that
the system tests continue to work against Derby (and vice-versa). It's not
intended to be a long (e.g. days) running test, just enough to cover the
functionality of the system test.
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java
Modified: db/derby/code/trunk/build.xml
URL:
http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=630301&r1=630300&r2=630301&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Feb 22 11:47:14 2008
@@ -1887,7 +1887,43 @@
</classpath>
</junit>
</target>
-
+
+ <!--
+ Run the simplest form of any system test. Provides a sanity
+ check that the functionality works. This target is not intended
+ to have long running tests, just enough to ensure the test works
+ and Derby works with the test.
+ -->
+ <target name="junit-system-mini" depends="junit-init">
+ <condition property="derby.junit.classpath" value="">
+ <not>
+ <isset property="derby.junit.classpath"/>
+ </not>
+ </condition>
+ <!--
+ Specifying max heap size (maxmemory) for JVMs spawned by this
+ target, since the default max heap size on most systems is
+ currently too low for some of the test suites. See DERBY-2988.
+ -->
+ <junit printsummary="on"
+ fork="yes" forkmode="perTest"
+ jvm="${derby.junit.jvm}" maxmemory="512m"
+ showoutput="yes"
+ dir="junit_${derby.junit.timestamp}"
+ errorproperty="tests.failed"
+ failureproperty="tests.failed">
+ <sysproperty key="derbyTesting.oldReleasePath"
value="${derbyTesting.oldReleasePath}"/>
+ <formatter type="xml"/>
+
+ <test name="org.apache.derbyTesting.system.oe.test.OETest"
+ todir="junit_${derby.junit.timestamp}"/>
+
+ <classpath>
+ <pathelement path="${derby.junit.classpath}"/>
+ </classpath>
+ </junit>
+ </target>
+
<!-- only execute jdbc4 suite if we have a pointer to a 1.6 VM -->
<target name="junit-jdbc4" if="jdk16" depends="junit-init">
<condition property="derby.junit.classpath" value="">
@@ -1973,6 +2009,16 @@
depends="junit-all-codeline-jars-set-properties,junit-all">
<fail if="tests.failed">Tests Failed!</fail>
</target>
+
+ <!-- Run the junit-system-mini target with the classpath set to include
+ the main derby jar files. Requires that the caller have
+ junit.jar in CLASSPATH due to some bug in ant that is
+ fixed in version 1.7.
+ -->
+ <target name="junit-system-mini-codeline-jars"
+ depends="junit-all-codeline-jars-set-properties,junit-system-mini">
+ <fail if="tests.failed">Tests Failed!</fail>
+ </target>
<target name="junit-all-codeline-jars-set-properties"
depends="setsanityname">
<property name="derby.jar.base"
value="${basedir}/jars/${sanity.name}"/>
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java
URL:
http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java?rev=630301&r1=630300&r2=630301&view=diff
==============================================================================
---
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java
(original)
+++
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OETest.java
Fri Feb 22 11:47:14 2008
@@ -58,6 +58,9 @@
suite.addTestSuite(OperationsTester.class);
suite.addTestSuite(OETest.class);
+
+ // Ensure the transactions left the data in a consistent state
+ suite.addTest(Checks.consistencyChecks());
return new CleanDatabaseTestSetup(suite);
}
