Author: aadamchik
Date: Sun Jul 30 13:40:38 2006
New Revision: 426937
URL: http://svn.apache.org/viewvc?rev=426937&view=rev
Log:
fixing unit tests
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/map/MapLoaderLoadTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/util/UtilTst.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/map/MapLoaderLoadTst.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/map/MapLoaderLoadTst.java?rev=426937&r1=426936&r2=426937&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/map/MapLoaderLoadTst.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/map/MapLoaderLoadTst.java
Sun Jul 30 13:40:38 2006
@@ -39,7 +39,10 @@
super.setUp();
mapLoader = new MapLoader();
- testDataMap =
ClassLoader.getSystemResource("testmap.map.xml").toExternalForm();
+ testDataMap = getClass()
+ .getClassLoader()
+ .getResource("testmap.map.xml")
+ .toExternalForm();
}
public void testLoadDataMap() throws Exception {
@@ -111,7 +114,7 @@
assertEquals(1,
queryWithPrefetch.getPrefetchTree().nonPhantomNodes().size());
assertNotNull(queryWithPrefetch.getPrefetchTree().getNode(
Gallery.PAINTING_ARRAY_PROPERTY));
-
+
SQLTemplate nonSelectingQuery = (SQLTemplate)
map.getQuery("NonSelectingQuery");
assertNotNull(nonSelectingQuery);
assertEquals("NonSelectingQuery", nonSelectingQuery.getName());
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java?rev=426937&r1=426936&r2=426937&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/tools/CayenneGeneratorv1_2Tst.java
Sun Jul 30 13:40:38 2006
@@ -52,7 +52,9 @@
// prepare destination directory
- File destDir = new File("testrun/cgen11");
+ File destDir = new File(
+ CayenneTestResources.getResources().getTestDir(),
+ "cgen11");
// prepare destination directory
if (!destDir.exists()) {
assertTrue(destDir.mkdirs());
@@ -92,15 +94,9 @@
assertTrue(a.isFile());
assertContents(a, "MyArtGroup", "org.apache.art2", "_MyArtGroup");
- File _a = new File(
- destDir,
- convertPath("org/apache/art2/auto/_MyArtGroup.java"));
+ File _a = new File(destDir,
convertPath("org/apache/art2/auto/_MyArtGroup.java"));
assertTrue(_a.exists());
- assertContents(
- _a,
- "_MyArtGroup",
- "org.apache.art2.auto",
- "CayenneDataObject");
+ assertContents(_a, "_MyArtGroup", "org.apache.art2.auto",
"CayenneDataObject");
assertContents(_a, "org.apache.art.ArtGroup getToParentGroup()");
assertContents(_a, "setToParentGroup(org.apache.art.ArtGroup
toParentGroup)");
}
@@ -109,7 +105,9 @@
public void testCrossDataMapRelationships() throws Exception {
// prepare destination directory
- File destDir = new File("testrun/cgen12");
+ File destDir = new File(
+ CayenneTestResources.getResources().getTestDir(),
+ "cgen12");
// prepare destination directory
if (!destDir.exists()) {
assertTrue(destDir.mkdirs());
@@ -149,15 +147,9 @@
assertTrue(a.isFile());
assertContents(a, "MyArtGroup", "org.apache.art2", "_MyArtGroup");
- File _a = new File(
- destDir,
- convertPath("org/apache/art2/auto/_MyArtGroup.java"));
+ File _a = new File(destDir,
convertPath("org/apache/art2/auto/_MyArtGroup.java"));
assertTrue(_a.exists());
- assertContents(
- _a,
- "_MyArtGroup",
- "org.apache.art2.auto",
- "CayenneDataObject");
+ assertContents(_a, "_MyArtGroup", "org.apache.art2.auto",
"CayenneDataObject");
assertContents(_a, "import org.apache.art.ArtGroup;");
assertContents(_a, " ArtGroup getToParentGroup()");
assertContents(_a, "setToParentGroup(ArtGroup toParentGroup)");
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java?rev=426937&r1=426936&r2=426937&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java
Sun Jul 30 13:40:38 2006
@@ -57,6 +57,7 @@
public static final String CONNECTION_NAME_KEY = "cayenne.test.connection";
public static final String SKIP_SCHEMA_KEY = "cayenne.test.schema.skip";
public static final String TEST_DIR_KEY = "cayenne.test.dir";
+ public static final String DEFAULT_TEST_DIR = "target/testrun";
public static final String SCHEMA_SETUP_STACK = "SchemaSetupStack";
public static final String SQL_TEMPLATE_CUSTOMIZER =
"SQLTemplateCustomizer";
@@ -174,12 +175,12 @@
* Completely rebuilds test schema.
*/
void rebuildSchema() throws Exception {
-
- if("true".equalsIgnoreCase(System.getProperty(SKIP_SCHEMA_KEY))) {
+
+ if ("true".equalsIgnoreCase(System.getProperty(SKIP_SCHEMA_KEY))) {
logObj.info("skipping schema generation... ");
return;
}
-
+
// generate schema using a special AccessStack that
// combines all DataMaps that require schema support
// schema generation is done like that instead of
@@ -304,7 +305,7 @@
String testDirName = System.getProperty(TEST_DIR_KEY);
if (testDirName == null) {
- testDirName = "testrun";
+ testDirName = DEFAULT_TEST_DIR;
logObj.info("No property '"
+ TEST_DIR_KEY
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/util/UtilTst.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/util/UtilTst.java?rev=426937&r1=426936&r2=426937&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/util/UtilTst.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/util/UtilTst.java
Sun Jul 30 13:40:38 2006
@@ -130,7 +130,7 @@
}
public void testCopyJarUrl() throws Exception {
- URL fileInJar = ClassLoader.getSystemResource("testfile1.txt");
+ URL fileInJar =
getClass().getClassLoader().getResource("testfile1.txt");
assertNotNull(fileInJar);
// skipping test if file not in jar
