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/01/22 18:23:51 UTC
[1/2] git commit: Rename authentication test classes to reflect the
actual test case. The JUnit classes test the opposite of what their original
names suggest.
Updated Branches:
refs/heads/master cc192f87b -> db5cf14c6
Rename authentication test classes to reflect the actual test case. The
JUnit classes test the opposite of what their original names suggest.
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/4313d6ff
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4313d6ff
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4313d6ff
Branch: refs/heads/master
Commit: 4313d6ffd015729635a4349f00fe38fb191edb8c
Parents: aeecd80
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Fri Jan 17 21:10:50 2014 -0500
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Fri Jan 17 21:10:50 2014 -0500
----------------------------------------------------------------------
.../jcr/AuthTokenLoginFailureTest.java | 63 --------------------
.../component/jcr/JcrAuthLoginFailureTest.java | 51 ++++++++++++++++
.../camel/component/jcr/JcrAuthLoginTest.java | 63 ++++++++++++++++++++
.../jcr/JcrAuthTokenWithLoginTest.java | 51 ----------------
4 files changed, 114 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4313d6ff/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
deleted file mode 100644
index 7309510..0000000
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jcr;
-
-import javax.jcr.Node;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class AuthTokenLoginFailureTest extends JcrAuthTestBase {
-
- @Test
- public void testCreateNodeWithAuthentication() throws Exception {
- Exchange exchange = createExchangeWithBody("<message>hello!</message>");
- Exchange out = template.send("direct:a", exchange);
- assertNotNull(out);
- String uuid = out.getOut().getBody(String.class);
- assertNotNull("Out body was null; expected JCR node UUID", uuid);
- Session session = getRepository().login(
- new SimpleCredentials("admin", "admin".toCharArray()));
- try {
- Node node = session.getNodeByIdentifier(uuid);
- assertNotNull(node);
- assertEquals(BASE_REPO_PATH + "/node", node.getPath());
- } finally {
- if (session != null && session.isLive()) {
- session.logout();
- }
- }
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- // START SNIPPET: jcr
- from("direct:a").setHeader(JcrConstants.JCR_NODE_NAME,
- constant("node")).setHeader("my.contents.property",
- body()).to(
- "jcr://test:quatloos@repository" + BASE_REPO_PATH);
- // END SNIPPET: jcr
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/4313d6ff/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
new file mode 100644
index 0000000..d3335e2
--- /dev/null
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginFailureTest.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jcr;
+
+import javax.jcr.LoginException;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class JcrAuthLoginFailureTest extends JcrAuthTestBase {
+
+ @Test
+ public void testCreateNodeWithAuthentication() throws Exception {
+ Exchange exchange = createExchangeWithBody("<message>hello!</message>");
+ Exchange out = template.send("direct:a", exchange);
+ assertNotNull(out);
+ String uuid = out.getOut().getBody(String.class);
+ assertNull("Expected body to be null, found JCR node UUID", uuid);
+ assertTrue("Wrong exception type", out.getException() instanceof LoginException);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // START SNIPPET: jcr
+ from("direct:a").setHeader(JcrConstants.JCR_NODE_NAME,
+ constant("node")).setHeader("my.contents.property",
+ body()).to(
+ "jcr://not-a-user:nonexisting-password@repository" + BASE_REPO_PATH);
+ // END SNIPPET: jcr
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4313d6ff/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
new file mode 100644
index 0000000..c35f63d
--- /dev/null
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthLoginTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jcr;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class JcrAuthLoginTest extends JcrAuthTestBase {
+
+ @Test
+ public void testCreateNodeWithAuthentication() throws Exception {
+ Exchange exchange = createExchangeWithBody("<message>hello!</message>");
+ Exchange out = template.send("direct:a", exchange);
+ assertNotNull(out);
+ String uuid = out.getOut().getBody(String.class);
+ assertNotNull("Out body was null; expected JCR node UUID", uuid);
+ Session session = getRepository().login(
+ new SimpleCredentials("admin", "admin".toCharArray()));
+ try {
+ Node node = session.getNodeByIdentifier(uuid);
+ assertNotNull(node);
+ assertEquals(BASE_REPO_PATH + "/node", node.getPath());
+ } finally {
+ if (session != null && session.isLive()) {
+ session.logout();
+ }
+ }
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // START SNIPPET: jcr
+ from("direct:a").setHeader(JcrConstants.JCR_NODE_NAME,
+ constant("node")).setHeader("my.contents.property",
+ body()).to(
+ "jcr://test:quatloos@repository" + BASE_REPO_PATH);
+ // END SNIPPET: jcr
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4313d6ff/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java
deleted file mode 100644
index 0d2aa77..0000000
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jcr;
-
-import javax.jcr.LoginException;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class JcrAuthTokenWithLoginTest extends JcrAuthTestBase {
-
- @Test
- public void testCreateNodeWithAuthentication() throws Exception {
- Exchange exchange = createExchangeWithBody("<message>hello!</message>");
- Exchange out = template.send("direct:a", exchange);
- assertNotNull(out);
- String uuid = out.getOut().getBody(String.class);
- assertNull("Expected body to be null, found JCR node UUID", uuid);
- assertTrue("Wrong exception type", out.getException() instanceof LoginException);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- // START SNIPPET: jcr
- from("direct:a").setHeader(JcrConstants.JCR_NODE_NAME,
- constant("node")).setHeader("my.contents.property",
- body()).to(
- "jcr://not-a-user:nonexisting-password@repository" + BASE_REPO_PATH);
- // END SNIPPET: jcr
- }
- };
- }
-}
[2/2] git commit: Merge branch 'FixJcrUnitTestNames' of
https://github.com/gzurowski/camel
Posted by da...@apache.org.
Merge branch 'FixJcrUnitTestNames' 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/db5cf14c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db5cf14c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db5cf14c
Branch: refs/heads/master
Commit: db5cf14c6a90366b2cbf64fa11ee288cad888873
Parents: cc192f8 4313d6f
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 22 18:22:04 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 22 18:22:04 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------