You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2021/03/17 14:41:34 UTC

[camel] branch master updated (ecbd4b4 -> 4aca4cc)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from ecbd4b4  Add ignore
     new dd148a1  Fix typo in AbstractBoxTestSupport
     new 4aca4cc  Fix managed test in camel-zipkin

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/camel/component/box/AbstractBoxTestSupport.java |  4 ++--
 .../camel/component/box/BoxUsersManagerIntegrationTest.java    | 10 +++++-----
 .../org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java  |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)


[camel] 01/02: Fix typo in AbstractBoxTestSupport

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit dd148a10844a44b769f600a853d953f5ea24d91b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 17 10:11:06 2021 +0100

    Fix typo in AbstractBoxTestSupport
---
 .../org/apache/camel/component/box/AbstractBoxTestSupport.java |  4 ++--
 .../camel/component/box/BoxUsersManagerIntegrationTest.java    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
index 59bc29d..71ae355 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
@@ -39,7 +39,7 @@ public class AbstractBoxTestSupport extends CamelTestSupport {
 
     protected BoxFolder testFolder;
     protected BoxFile testFile;
-    protected boolean jwtAuthentoication;
+    protected boolean jwtAuthentication;
     protected Map<String, Object> options;
 
     @Override
@@ -72,7 +72,7 @@ public class AbstractBoxTestSupport extends CamelTestSupport {
 
         //initialize flag, whether is box configuration JWT
         String authenticationType = properties.getProperty("authenticationType");
-        jwtAuthentoication = !BoxConfiguration.STANDARD_AUTHENTICATION.equals(authenticationType);
+        jwtAuthentication = !BoxConfiguration.STANDARD_AUTHENTICATION.equals(authenticationType);
 
         return context;
     }
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
index 017435c..2001548 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
@@ -86,7 +86,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
     @Test
     public void testCreateAppUser() throws Exception {
         //This test makes sense only with JWT authentication. With standard (OAuth) it will always fail.
-        assumeTrue(jwtAuthentoication, "Test has to be executed with standard authentication.");
+        assumeTrue(jwtAuthentication, "Test has to be executed with standard authentication.");
 
         com.box.sdk.BoxUser result = null;
 
@@ -117,7 +117,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
     @Test
     public void testCreateEnterpriseUser() throws Exception {
         //This test makes sense only with standard (OAuth) authentication, with JWT it will always fail with return code 403
-        assumeFalse(jwtAuthentoication, "Test has to be executed with standard authentication.");
+        assumeFalse(jwtAuthentication, "Test has to be executed with standard authentication.");
 
         String enterpriseUser1Login = (String) options.get(CAMEL_TEST_ENTERPRISE_USER_LOGIN_KEY);
         if (enterpriseUser1Login != null && "".equals(enterpriseUser1Login.trim())) {
@@ -158,7 +158,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
     @Test
     public void testDeleteUser() throws Exception {
         //This test makes sense only with JWT authentication. With standard (OAuth) it will always fail.
-        assumeTrue(jwtAuthentoication, "Test has to be executed with standard authentication.");
+        assumeTrue(jwtAuthentication, "Test has to be executed with standard authentication.");
 
         BoxUser.Info info = BoxUser.createAppUser(getConnection(), CAMEL_TEST_CREATE_APP_USER_NAME);
 
@@ -245,7 +245,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
     @Test
     public void testUpdateUserInfo() throws Exception {
         //This test makes sense only with standard (OAuth) authentication, with JWT it will always fail with return code 403
-        assumeFalse(jwtAuthentoication, "Test has to be executed with standard authentication.");
+        assumeFalse(jwtAuthentication, "Test has to be executed with standard authentication.");
 
         BoxUser.Info info = testUser.getInfo();
         info.setJobTitle(CAMEL_TEST_USER_JOB_TITLE);
@@ -269,7 +269,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
     @Test
     public void testmMoveFolderToUser() throws Exception {
         //This test makes sense only with standard (OAuth) authentication, with JWT it will always fail with return code 403
-        assumeFalse(jwtAuthentoication, "Test has to be executed with standard authentication.");
+        assumeFalse(jwtAuthentication, "Test has to be executed with standard authentication.");
 
         String enterpriseUser1Login = (String) options.get(CAMEL_TEST_ENTERPRISE_USER_LOGIN_KEY);
         String enterpriseUser2Login = (String) options.get(CAMEL_TEST_ENTERPRISE_USER2_LOGIN_KEY);


[camel] 02/02: Fix managed test in camel-zipkin

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4aca4cc36ea7d5136881c28d3045d4360a265484
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 17 10:11:21 2021 +0100

    Fix managed test in camel-zipkin
---
 .../java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java
index c1db957..ed513a8 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java
@@ -73,7 +73,8 @@ public class ManagedZipkinSimpleRouteTest extends CamelTestSupport {
         }
 
         MBeanServer mbeanServer = getMBeanServer();
-        ObjectName on = new ObjectName("org.apache.camel:context=camel-1,type=services,name=ZipkinTracer");
+        ObjectName on = new ObjectName(
+                "org.apache.camel:context=" + context.getManagementName() + ",type=services,name=ZipkinTracer");
         assertNotNull(on);
         assertTrue(mbeanServer.isRegistered(on));