You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2005/05/13 21:26:03 UTC
svn commit: r170073 - in /incubator/jdo/trunk/tck20: maven.xml project.xml
test/conf/derby.properties test/conf/simplelog.properties
test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
Author: clr
Date: Fri May 13 12:26:01 2005
New Revision: 170073
URL: http://svn.apache.org/viewcvs?rev=170073&view=rev
Log:
removed dependency on database from runtck.single and runtck.jdorisingle to avoid rebuilding database every time a change was made to a single test case
Modified:
incubator/jdo/trunk/tck20/maven.xml
incubator/jdo/trunk/tck20/project.xml
incubator/jdo/trunk/tck20/test/conf/derby.properties
incubator/jdo/trunk/tck20/test/conf/simplelog.properties
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=170073&r1=170072&r2=170073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Fri May 13 12:26:01 2005
@@ -66,7 +66,7 @@
<!-- Run a single tck test. The property testcase defines the name of -->
<!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g. -->
<!-- maven -Dtest=api.jdohelper.GetObjectId runtck.single -->
- <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, database, copyloggingprops">
+ <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, copyloggingprops">
<echo>Run TCK test org.apache.jdo.tck.${test} on the IUT with configuration ${jdo.tck.configuration}</echo>
<java fork="yes" dir="${jdo.tck.testdir}"
classname="org.apache.jdo.tck.${test}">
@@ -98,7 +98,7 @@
<!-- Run a single tck test. The property testcase defines the name of -->
<!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g. -->
<!-- maven -Dtest=api.jdohelper.GetObjectId runtck.single -->
- <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, database, copyloggingprops">
+ <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, copyloggingprops">
<echo>Run TCK test org.apache.jdo.tck.${test} on the RI with configuration ${jdo.tck.configuration}</echo>
<java fork="yes" dir="${jdo.tck.testdir}"
classname="org.apache.jdo.tck.${test}">
Modified: incubator/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?rev=170073&r1=170072&r2=170073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.xml (original)
+++ incubator/jdo/trunk/tck20/project.xml Fri May 13 12:26:01 2005
@@ -29,8 +29,7 @@
The JDO TCK is a test suite designed to test implementations of the Java Data Objects specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
-NOTE!! This project has a nonstandard structure. The source files are located in the test directory. However the build treats this directory as the source directory. There are no unit tests in this project.
- </description>
+NOTE!! This project has a nonstandard structure. The source files are located in the test directory. However the build treats this directory as the source directory. There are no unit tests in this project.</description>
<repository />
<!-- ============ -->
<!-- Dependencies -->
@@ -41,16 +40,6 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc2</version>
- </dependency>
- <dependency>
- <groupId>apache-jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
<!-- You must manually download jpox until it is available from ibiblio.org -->
<dependency>
<groupId>jpox</groupId>
@@ -59,23 +48,12 @@
<url>http://www.jpox.org/docs/download.html</url>
</dependency>
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-enhancer</artifactId>
- <version>SNAPSHOT</version>
- <url>http://www.jpox.org/docs/download.html</url>
- </dependency>
- <dependency>
<groupId>bcel</groupId>
<artifactId>bcel</artifactId>
<version>5.1</version>
<url>http://jakarta.apache.org/bcel/</url>
</dependency>
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
@@ -89,6 +67,27 @@
<groupId>derby</groupId>
<artifactId>derby</artifactId>
<version>10.0.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jta</artifactId>
+ <version>1.0.1B-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>jpox</groupId>
+ <artifactId>jpox-enhancer</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://www.jpox.org/docs/download.html</url>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>derby</groupId>
Modified: incubator/jdo/trunk/tck20/test/conf/derby.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/derby.properties?rev=170073&r1=170072&r2=170073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/derby.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/derby.properties Fri May 13 12:26:01 2005
@@ -1,2 +1,2 @@
# This flag must be set on Mac OSX
-#derby.storage.fileSyncTransactionLog=true
+derby.storage.fileSyncTransactionLog=true
Modified: incubator/jdo/trunk/tck20/test/conf/simplelog.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/simplelog.properties?rev=170073&r1=170072&r2=170073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/simplelog.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/simplelog.properties Fri May 13 12:26:01 2005
@@ -24,7 +24,7 @@
# JDO TCK test cases
######################
-#org.apache.commons.logging.simplelog.log.org.apache.jdo.tck = debug
+org.apache.commons.logging.simplelog.log.org.apache.jdo.tck = debug
######################
# default logging level
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java?rev=170073&r1=170072&r2=170073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java Fri May 13 12:26:01 2005
@@ -150,6 +150,7 @@
private void checkValues(Object oid, Hashtable startValue)
{
int i;
+ int failedCount = 0;
ArrayCollections pi = (ArrayCollections) pm.getObjectById(oid, true);
int n = pi.getLength();
for (i = 0; i < n; ++i) {
@@ -166,17 +167,21 @@
Object[] val = pi.get(i);
if(!Arrays.equals(val, compareWith)){
+ failedCount++;
if (debug) {
- String message1 = compareWith==null?"compareWith was null!!!":
+ logger.debug("checkValues comparison failed for field " + i);
+ String message1 = compareWith==null?"unexpectedly null!!!":
compareWith.toString();
- String message2 = val==null?"val was null!!!":
+ String message2 = val==null?"unexpectedly null!!!":
val.toString();
- logger.debug("compareWith: " + message1);
- logger.debug("val: "+ message2);
+ logger.debug("expected: " + message1);
+ logger.debug("actual: "+ message2);
}
- fail(ASSERTION_FAILED,
- "Incorrect value for " + ArrayCollections.fieldSpecs[i]);
}
+ }
+ if (failedCount != 0) {
+ fail(ASSERTION_FAILED,
+ "TestArrayCollections " + failedCount + " fields failed to compare.");
}
}
}