Author: ghuber
Date: Fri Jan 10 09:21:57 2014
New Revision: 1557062
URL: http://svn.apache.org/r1557062
Log:
More info on unit tests clear
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java?rev=1557062&r1=1557061&r2=1557062&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
Fri Jan 10 09:21:57 2014
@@ -130,14 +130,15 @@ public final class TestUtils {
*/
private static void clearTestData() throws Exception {
+ String scriptFile = "junit-cleartables-mysql.sql";
+
ClasspathDatabaseScriptProvider scriptProvider = new
ClasspathDatabaseScriptProvider();
- InputStream script = scriptProvider
- .getDatabaseScript("junit-cleartables-mysql.sql");
+ InputStream script = scriptProvider.getDatabaseScript(scriptFile);
if (script == null) {
- System.out
- .println("File /dbscripts/junit-cleartables-mysql.sql not
found on class path.");
+ System.out.println("File /dbscripts/" + scriptFile
+ + " not found on class path.");
return;
}
@@ -152,6 +153,9 @@ public final class TestUtils {
if (runner != null) {
+ System.out.println("Clearing files using script file : "
+ + scriptProvider.getScriptURL(scriptFile));
+
// Loop script and remove invalid lines
List<String> updatedCommands = new ArrayList<String>();
List<String> commands = runner.getCommands();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java?rev=1557062&r1=1557061&r2=1557062&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/ClasspathDatabaseScriptProvider.java
Fri Jan 10 09:21:57 2014
@@ -19,6 +19,7 @@
package org.apache.roller.weblogger.business.startup;
import java.io.InputStream;
+import java.net.URL;
/**
* Reads dbscripts from the classpath.
@@ -33,4 +34,17 @@ public class ClasspathDatabaseScriptProv
return this.getClass().getResourceAsStream(resourcePath);
}
+ /**
+ * Gets the script url.
+ *
+ * @param path
+ * the path
+ *
+ * @return the script url
+ */
+ public URL getScriptURL(String path) {
+ String resourcePath = "/dbscripts/" + path;
+ return ClasspathDatabaseScriptProvider.class.getResource(resourcePath);
+ }
+
}
