You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/12/08 15:49:02 UTC
svn commit: r888416 - in
/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr:
JcrAuthTestBase.java JcrNodePathCreationTest.java JcrRouteTest.java
Author: davsclaus
Date: Tue Dec 8 14:49:01 2009
New Revision: 888416
URL: http://svn.apache.org/viewvc?rev=888416&view=rev
Log:
Fixed unit test having problem on Windows deleting files for cleanup.
Modified:
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java?rev=888416&r1=888415&r2=888416&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java Tue Dec 8 14:49:01 2009
@@ -17,8 +17,6 @@
package org.apache.camel.component.jcr;
import java.io.File;
-import java.io.IOException;
-
import javax.jcr.Repository;
import javax.jcr.SimpleCredentials;
import javax.naming.Context;
@@ -30,7 +28,6 @@
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.TransientRepository;
-import org.apache.jackrabbit.core.fs.local.FileUtil;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
import org.junit.Before;
@@ -49,14 +46,11 @@
private Repository repository;
- private void clean() throws IOException {
- File[] files = {new File("target/repository_with_auth"),
- new File("derby.log") };
- for (File file : files) {
- if (file.exists()) {
- FileUtil.delete(file);
- }
- }
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ deleteDirectory("target/repository");
+ super.setUp();
}
@Override
@@ -106,11 +100,4 @@
return repository;
}
- @Override
- @Before
- public void setUp() throws Exception {
- clean();
- super.setUp();
- }
-
}
\ No newline at end of file
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java?rev=888416&r1=888415&r2=888416&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java Tue Dec 8 14:49:01 2009
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.jcr;
-import java.io.File;
-import java.io.IOException;
-
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.Session;
@@ -29,7 +26,6 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.jackrabbit.core.TransientRepository;
-import org.apache.jackrabbit.core.fs.local.FileUtil;
import org.junit.Before;
import org.junit.Test;
@@ -40,20 +36,10 @@
@Override
@Before
public void setUp() throws Exception {
- clean();
+ deleteDirectory("target/repository");
super.setUp();
}
- private void clean() throws IOException {
- File[] files = {new File("target/repository"), new File("target/repository.xml"),
- new File("derby.log")};
- for (File file : files) {
- if (file.exists()) {
- FileUtil.delete(file);
- }
- }
- }
-
@Test
public void testJcrNodePathCreation() throws Exception {
Exchange exchange = createExchangeWithBody("<body/>");
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java?rev=888416&r1=888415&r2=888416&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteTest.java Tue Dec 8 14:49:01 2009
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.jcr;
-import java.io.File;
-import java.io.IOException;
-
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.Session;
@@ -29,7 +26,6 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.jackrabbit.core.TransientRepository;
-import org.apache.jackrabbit.core.fs.local.FileUtil;
import org.junit.Before;
import org.junit.Test;
@@ -40,20 +36,10 @@
@Override
@Before
public void setUp() throws Exception {
- clean();
+ deleteDirectory("target/repository");
super.setUp();
}
- private void clean() throws IOException {
- File[] files = {new File("target/repository"), new File("target/repository.xml"),
- new File("derby.log")};
- for (File file : files) {
- if (file.exists()) {
- FileUtil.delete(file);
- }
- }
- }
-
@Test
public void testJcrRoute() throws Exception {
Exchange exchange = createExchangeWithBody("<hello>world!</hello>");