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/27 08:12:17 UTC
[34/39] cayenne git commit: attempt to fix Jenkins failure
attempt to fix Jenkins failure
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3c166f9b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3c166f9b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3c166f9b
Branch: refs/heads/CAY-1946_1
Commit: 3c166f9bf597c7943fe73c9831b008c52365941d
Parents: 511c9a4
Author: aadamchik <aa...@apache.org>
Authored: Tue Nov 25 09:41:03 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Tue Nov 25 09:41:03 2014 +0300
----------------------------------------------------------------------
.../apache/cayenne/tools/DbImporterMojoTest.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3c166f9b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index a255a9c..83bb0d2 100644
--- a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++ b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -18,10 +18,13 @@
****************************************************************/
package org.apache.cayenne.tools;
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.net.URISyntaxException;
+import java.net.URL;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -34,9 +37,6 @@ import org.codehaus.plexus.util.FileUtils;
import org.custommonkey.xmlunit.XMLUnit;
import org.xml.sax.SAXException;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.assertNotNull;
-
public class DbImporterMojoTest extends AbstractMojoTestCase {
static {
@@ -136,14 +136,14 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
// Get a connection
Statement stmt = DriverManager.getConnection(dbImportConfiguration.getUrl()).createStatement();
- for (String sql : FileUtils.fileRead(getPackagePath() + "/dbimport/" + sqlFile + ".sql").split(";")) {
+ for (String sql : FileUtils.fileRead(sqlFile(sqlFile + ".sql")).split(";")) {
stmt.execute(sql);
}
}
- private String getPackagePath() {
- return getClass().getClassLoader().getResource(getClass().getPackage().getName().replace('.', '/')).getPath();
- }
-
-
+ private File sqlFile(String name) throws URISyntaxException {
+ URL url = DbImporterMojoTest.class.getResource("dbimport/" + name);
+ assertNotNull("Can't find resource: " + name);
+ return new File(url.toURI());
+ }
}