You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/28 14:25:25 UTC

cayenne git commit: fixing DefaultReverseEngineeringLoaderTest unit test

Repository: cayenne
Updated Branches:
  refs/heads/master 98a32fd77 -> f1ce0a11b


fixing DefaultReverseEngineeringLoaderTest unit test


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f1ce0a11
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f1ce0a11
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f1ce0a11

Branch: refs/heads/master
Commit: f1ce0a11be8c62a75edfd113c2b952d5b157b8cb
Parents: 98a32fd
Author: aadamchik <aa...@apache.org>
Authored: Fri Nov 28 16:25:14 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Fri Nov 28 16:25:14 2014 +0300

----------------------------------------------------------------------
 .../config/DefaultReverseEngineeringLoaderTest.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/f1ce0a11/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
index bf3b9f3..9597af5 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/config/DefaultReverseEngineeringLoaderTest.java
@@ -34,7 +34,7 @@ public class DefaultReverseEngineeringLoaderTest {
     @Test
     public void testLoadCatalog() throws Exception {
         ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
-                .load(getResource("/reverseEngineering-catalog.xml"));
+                .load(getResource("reverseEngineering-catalog.xml"));
 
         assertCatalog(engineering);
     }
@@ -87,7 +87,7 @@ public class DefaultReverseEngineeringLoaderTest {
     @Test
     public void testLoadSchema() throws Exception {
         ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
-                .load(getResource("/reverseEngineering-schema.xml"));
+                .load(getResource("reverseEngineering-schema.xml"));
 
         assertSchema(engineering);
     }
@@ -140,7 +140,7 @@ public class DefaultReverseEngineeringLoaderTest {
     @Test
     public void testLoadCatalogAndSchema() throws Exception {
         ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
-                .load(getResource("/reverseEngineering-catalog-and-schema.xml"));
+                .load(getResource("reverseEngineering-catalog-and-schema.xml"));
 
         assertCatalogAndSchema(engineering);
     }
@@ -158,7 +158,7 @@ public class DefaultReverseEngineeringLoaderTest {
     @Test
     public void testLoadFlat() throws Exception {
         ReverseEngineering engineering = new DefaultReverseEngineeringLoader()
-                .load(getResource("/reverseEngineering-flat.xml"));
+                .load(getResource("reverseEngineering-flat.xml"));
 
         assertFlat(engineering);
     }
@@ -198,11 +198,7 @@ public class DefaultReverseEngineeringLoaderTest {
     }
 
     protected URLResource getResource(String file) throws MalformedURLException {
-        return new URLResource(new File(getPackagePath() + file).toURI().toURL());
-    }
-
-    private String getPackagePath() {
-        return getClass().getClassLoader().getResource(getClass().getPackage().getName().replace('.', '/')).getPath();
-    }
+		return new URLResource(getClass().getResource(file));
+	}
 
 }
\ No newline at end of file