db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r1044873 - in /db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck: Enhance.java RunTCK.java
Date Sun, 12 Dec 2010 18:21:49 GMT
Author: mcaisse
Date: Sun Dec 12 18:21:49 2010
New Revision: 1044873

URL: http://svn.apache.org/viewvc?rev=1044873&view=rev
Log:
JDO-647 - Test data is now copied to the enhanced dir and the property is passed to the test
runner. However, the test is still unable to find the test data on the classpath.

Modified:
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java?rev=1044873&r1=1044872&r2=1044873&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java Sun Dec 12 18:21:49
2010
@@ -139,6 +139,13 @@ public class Enhance extends AbstractMoj
                                     + pkgName);
 //                        System.out.println("Copy from source dir to " + toFile.toString());
                             FileUtils.copyFile(fromFile, toFile);
+                        } else if (srcDir.equals("testdata")) {
+                            startIdx = fromFileName.indexOf("org" + File.separator);
+                            pkgName = fromFileName.substring(startIdx);
+                            toFile = new File(enhancedDirName + File.separator
+                                    + idtype + File.separator + pkgName);
+                            System.out.println("Copy from " + fromFile.toString() + " to
" + toFile.toString());
+                            FileUtils.copyFile(fromFile, toFile);
                         } else {
                             continue;  // idtype not in pathname, do not copy
                         }

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java?rev=1044873&r1=1044872&r2=1044873&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java Sun Dec 12 18:21:49
2010
@@ -219,11 +219,11 @@ public class RunTCK extends AbstractMojo
         List<String> propsString = new ArrayList<String>();
 
         if (cfgs != null) {
-            System.out.println("Configurations specified in cfgs are " + cfgs.toString());
+//            System.out.println("Configurations specified in cfgs are " + cfgs.toString());
         } else if (cfgList != null) {
             cfgs = new ArrayList();
             PropertyUtils.string2List(cfgList, cfgs);
-            System.out.println("Configurations are " + cfgs.toString());
+//            System.out.println("Configurations are " + cfgs.toString());
         } else {
             throw new MojoExecutionException(
                     "Could not find configurations to run TCK. "
@@ -316,6 +316,8 @@ public class RunTCK extends AbstractMojo
                             props.getProperty("jdo.tck.testdata"));
                     propsString.add("-Djdo.tck.standarddata=" +
                             props.getProperty("jdo.tck.standarddata"));
+                    propsString.add("-Djdo.tck.mapping.companyfactory=" +
+                            props.getProperty("jdo.tck.mapping.companyfactory"));
 //                    propsString.append("-Djdo.tck.description=\"" +
 //                            props.getProperty("jdo.tck.description") + "\"");
                     propsString.add("-Djdo.tck.requiredOptions=" +



Mime
View raw message