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 2014/03/26 08:20:20 UTC
[1/2] git commit: Refactor and simplify JUnit test cases for camel-jcr
Repository: camel
Updated Branches:
refs/heads/master 713981a32 -> d798d0251
Refactor and simplify JUnit test cases for camel-jcr
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86181743
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86181743
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86181743
Branch: refs/heads/master
Commit: 86181743bb4874c98f8615125d8e5def20932215
Parents: fcd2acc
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Tue Mar 18 14:41:17 2014 -0400
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Tue Mar 18 14:41:17 2014 -0400
----------------------------------------------------------------------
.../camel/component/jcr/JcrGetNodeByIdTest.java | 1 -
.../component/jcr/JcrNodePathCreationTest.java | 27 +++-----------------
.../component/jcr/JcrProducerSubNodeTest.java | 7 -----
.../camel/component/jcr/JcrProducerTest.java | 7 -----
4 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86181743/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
index d0ea37a..3f525d6 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java
@@ -37,7 +37,6 @@ public class JcrGetNodeByIdTest extends JcrRouteTestSupport {
@Override
@Before
public void setUp() throws Exception {
- deleteDirectory("target/repository");
super.setUp();
Session session = openSession();
http://git-wip-us.apache.org/repos/asf/camel/blob/86181743/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
index 12df8f9..46dafb0 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
@@ -29,20 +29,7 @@ import org.apache.jackrabbit.core.TransientRepository;
import org.junit.Before;
import org.junit.Test;
-public class JcrNodePathCreationTest extends CamelTestSupport {
-
- protected static final String CONFIG_FILE = "target/test-classes/repository-simple-security.xml";
-
- protected static final String REPO_PATH = "target/repository-simple-security";
-
- private Repository repository;
-
- @Override
- @Before
- public void setUp() throws Exception {
- deleteDirectory(REPO_PATH);
- super.setUp();
- }
+public class JcrNodePathCreationTest extends JcrRouteTestSupport {
@Test
public void testJcrNodePathCreation() throws Exception {
@@ -51,7 +38,7 @@ public class JcrNodePathCreationTest extends CamelTestSupport {
assertNotNull(out);
String uuid = out.getOut().getBody(String.class);
assertNotNull("Out body was null; expected JCR node UUID", uuid);
- Session session = repository.login(new SimpleCredentials("user", "pass".toCharArray()));
+ Session session = openSession();
try {
Node node = session.getNodeByIdentifier(uuid);
assertNotNull(node);
@@ -75,13 +62,5 @@ public class JcrNodePathCreationTest extends CamelTestSupport {
}
};
}
-
- @Override
- protected Context createJndiContext() throws Exception {
- Context context = super.createJndiContext();
- repository = new TransientRepository(CONFIG_FILE, REPO_PATH);
- context.bind("repository", repository);
- return context;
- }
-
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/86181743/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
index 42d4a55..d5f426c 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerSubNodeTest.java
@@ -27,13 +27,6 @@ import org.junit.Test;
public class JcrProducerSubNodeTest extends JcrRouteTestSupport {
- @Override
- @Before
- public void setUp() throws Exception {
- deleteDirectory("target/repository");
- super.setUp();
- }
-
@Test
public void testCreateNodeAndSubNode() throws Exception {
Session session = openSession();
http://git-wip-us.apache.org/repos/asf/camel/blob/86181743/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
index 231fefa..a4be9bf 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrProducerTest.java
@@ -26,13 +26,6 @@ import org.junit.Test;
public class JcrProducerTest extends JcrRouteTestSupport {
- @Override
- @Before
- public void setUp() throws Exception {
- deleteDirectory("target/repository");
- super.setUp();
- }
-
@Test
public void testJcrProducer() throws Exception {
Exchange exchange = createExchangeWithBody("<hello>world!</hello>");
[2/2] git commit: Merge branch 'RefactorUnitTests' of
https://github.com/gzurowski/camel
Posted by da...@apache.org.
Merge branch 'RefactorUnitTests' of https://github.com/gzurowski/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d798d025
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d798d025
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d798d025
Branch: refs/heads/master
Commit: d798d02518690de5289c208d318db24c1745c4d7
Parents: 713981a 8618174
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 26 08:16:53 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 26 08:16:53 2014 +0100
----------------------------------------------------------------------
.../camel/component/jcr/JcrGetNodeByIdTest.java | 1 -
.../component/jcr/JcrNodePathCreationTest.java | 27 +++-----------------
.../component/jcr/JcrProducerSubNodeTest.java | 7 -----
.../camel/component/jcr/JcrProducerTest.java | 7 -----
4 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------