cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1586829 - in /cayenne/main/trunk/cayenne-project/src/test: java/org/apache/cayenne/project/upgrade/v7/ resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/ resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shado...
Date Sat, 12 Apr 2014 08:06:13 GMT
Author: aadamchik
Date: Sat Apr 12 08:06:13 2014
New Revision: 1586829

URL: http://svn.apache.org/r1586829
Log:
CAY-1795 "Invisible" ObjAttribute in subclass

cleanup
* removing System.out calls
* adding missing services in the unit test container
* Renaming ObjAttributeDeleting test package to delete_shadow_attributes
  for clarity and to follow package naming conventions

Added:
    cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/
    cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml
      - copied, changed from r1586828, cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/cayenne-TestProject.xml
    cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap1.map.xml
      - copied, changed from r1586828, cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/testProjectMap1.map.xml
    cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap2.map.xml
      - copied, changed from r1586828, cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/testProjectMap2.map.xml
Removed:
    cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/
Modified:
    cayenne/main/trunk/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java

Modified: cayenne/main/trunk/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java?rev=1586829&r1=1586828&r2=1586829&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
(original)
+++ cayenne/main/trunk/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
Sat Apr 12 08:06:13 2014
@@ -187,7 +187,6 @@ public class ProjectUpgrader_V7Test exte
 
     public void testPerformUpgradeFrom3() throws Exception {
 
-        System.out.println("TEST3");
         File testFolder = setupTestDirectory("testPerformUpgrade_3_0_0_1");
         String sourceUrl = getClass().getPackage().getName().replace('.', '/') + "/3_0_0_1a/";
 
@@ -351,7 +350,6 @@ public class ProjectUpgrader_V7Test exte
     public void testPerformUpgradeFrom6() throws Exception {
         File testFolder = setupTestDirectory("testUpgrade6a");
         String sourceUrl = getClass().getPackage().getName().replace('.', '/') + "/6a/";
-        System.out.println(sourceUrl);
         Module testModule = new Module() {
 
             public void configure(Binder binder) {
@@ -419,17 +417,18 @@ public class ProjectUpgrader_V7Test exte
     }
 
     public void testObjAttributeDelete() throws Exception {
-        System.out.println("Test ObjAttribute deleting.");
 
         File testFolder = setupTestDirectory("testObjAttribute");
-        String sourceUrl = getClass().getPackage().getName().replace('.', '/') + "/6a/ObjAttributeDeleting/";
+        String sourceUrl = getClass().getPackage().getName().replace('.', '/') + "/6a/delete_shadow_attributes/";
 
         Module testModule = new Module() {
 
             public void configure(Binder binder) {
                 binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
                 binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
+                binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
                 binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
+                binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
             }
         };
 

Copied: cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml
(from r1586828, cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/cayenne-TestProject.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml?p2=cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml&p1=cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/cayenne-TestProject.xml&r1=1586828&r2=1586829&rev=1586829&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap1.map.xml
(from r1586828, cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/testProjectMap1.map.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap1.map.xml?p2=cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap1.map.xml&p1=cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/testProjectMap1.map.xml&r1=1586828&r2=1586829&rev=1586829&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap2.map.xml
(from r1586828, cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/testProjectMap2.map.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap2.map.xml?p2=cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/testProjectMap2.map.xml&p1=cayenne/main/trunk/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/ObjAttributeDeleting/testProjectMap2.map.xml&r1=1586828&r2=1586829&rev=1586829&view=diff
==============================================================================
    (empty)



Mime
View raw message