svn commit: r1535665 - /openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java

[st...@apache.org]

Author: struberg
Date: Fri Oct 25 09:35:32 2013
New Revision: 1535665

URL: http://svn.apache.org/r1535665
Log:
OPENJPA-2444 also use target folder in the test itself

Modified:
    openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java

Modified: openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java?rev=1535665&r1=1535664&r2=1535665&view=diff
==============================================================================
--- openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java (original)
+++ openjpa/branches/2.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java Fri Oct 25 09:35:32 2013
@@ -41,6 +41,12 @@ public class TestUseSchemaElement extend
 
     public void setUp() throws Exception {
         super.setUp();
+        File f = new File("target/orm.xml");
+
+        // Make sure to clean up orm.xml from a prior run
+        if (f.exists()) {
+            assertTrue(f.delete());
+        }
         setSupportedDatabases(org.apache.openjpa.jdbc.sql.DerbyDictionary.class);
     }
 
@@ -113,7 +119,7 @@ public class TestUseSchemaElement extend
         }
 
         // This tests the removal of the schema name from the orm.xml file
-        File orm = new File("./orm.xml");
+        File orm = new File("target/orm.xml");
         try {
             inFile = new Scanner(orm);
             while(inFile.hasNextLine())