You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/09/07 06:29:31 UTC
[camel] branch master updated (a5e4eca -> abfe501)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a5e4eca Remove log placeholders from exception messages
new 2272482 [CAMEL-12780] Fixed tests
new abfe501 Fixed CS Camel-salesforce
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:
.../component/salesforce/BulkApiBatchIntegrationTest.java | 3 +--
.../component/salesforce/BulkApiQueryIntegrationTest.java | 3 +--
.../camel/component/salesforce/HttpProxyIntegrationTest.java | 1 -
.../org/apache/camel/component/salesforce/RawPayloadTest.java | 1 -
.../camel/component/salesforce/SalesforceConsumerTest.java | 11 ++++++-----
5 files changed, 8 insertions(+), 11 deletions(-)
[camel] 01/02: [CAMEL-12780] Fixed tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2272482833ae289ca4d58b15125a0de57232dc09
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Sep 7 08:22:30 2018 +0200
[CAMEL-12780] Fixed tests
---
.../camel/component/salesforce/SalesforceConsumerTest.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
index 80db986..08e2964 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
@@ -23,7 +23,9 @@ import java.util.Map;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sun.xml.bind.v2.schemagen.xmlschema.Any;
+import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -37,6 +39,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -125,7 +128,7 @@ public class SalesforceConsumerTest {
verify(in).setHeader("CamelSalesforceChannel", "/topic/AccountUpdates");
verify(in).setHeader("CamelSalesforceClientId", "lxdl9o32njygi1gj47kgfaga4k");
- verify(processor).process(same(exchange));
+ verify(processor).process(same(exchange), any());
}
@Test
@@ -159,7 +162,7 @@ public class SalesforceConsumerTest {
verify(in).setHeader("CamelSalesforceEventType", "TestEvent__e");
verify(in).setHeader("CamelSalesforcePlatformEventSchema", "30H2pgzuWcF844p26Ityvg");
- verify(processor).process(same(exchange));
+ verify(processor).process(same(exchange), any());
verifyNoMoreInteractions(in, processor);
}
@@ -182,7 +185,7 @@ public class SalesforceConsumerTest {
verify(in).setHeader("CamelSalesforceChannel", "/topic/AccountUpdates");
verify(in).setHeader("CamelSalesforceClientId", "lxdl9o32njygi1gj47kgfaga4k");
- verify(processor).process(same(exchange));
+ verify(processor).process(same(exchange), any());
}
@Test
@@ -202,7 +205,7 @@ public class SalesforceConsumerTest {
verify(in).setHeader("CamelSalesforceChannel", "/topic/AccountUpdates");
verify(in).setHeader("CamelSalesforceClientId", "lxdl9o32njygi1gj47kgfaga4k");
- verify(processor).process(same(exchange));
+ verify(processor).process(same(exchange), any());
}
@Test
@@ -234,7 +237,7 @@ public class SalesforceConsumerTest {
verify(in).setHeader("CamelSalesforceEventType", "TestEvent__e");
verify(in).setHeader("CamelSalesforcePlatformEventSchema", "30H2pgzuWcF844p26Ityvg");
- verify(processor).process(same(exchange));
+ verify(processor).process(same(exchange), any()) ;
verifyNoMoreInteractions(in, processor);
}
[camel] 02/02: Fixed CS Camel-salesforce
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit abfe5016deb4ababc6232b138b35ceda225a362e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Sep 7 08:28:57 2018 +0200
Fixed CS Camel-salesforce
---
.../camel/component/salesforce/BulkApiBatchIntegrationTest.java | 3 +--
.../camel/component/salesforce/BulkApiQueryIntegrationTest.java | 3 +--
.../apache/camel/component/salesforce/HttpProxyIntegrationTest.java | 1 -
.../java/org/apache/camel/component/salesforce/RawPayloadTest.java | 1 -
.../apache/camel/component/salesforce/SalesforceConsumerTest.java | 6 ++----
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
index d300317..4349e46 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.salesforce;
-import org.junit.Test;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,6 +28,7 @@ import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
import org.apache.camel.component.salesforce.api.dto.bulk.JobInfo;
import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
+import org.junit.Test;
import org.junit.experimental.theories.DataPoints;
import org.junit.experimental.theories.Theory;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
index 5b43249..439289a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.salesforce;
-import org.junit.Test;
-
import java.io.InputStream;
import java.util.List;
@@ -27,6 +25,7 @@ import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
import org.apache.camel.component.salesforce.api.dto.bulk.JobInfo;
import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
+import org.junit.Test;
import org.junit.experimental.theories.DataPoints;
import org.junit.experimental.theories.Theory;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
index ebe6cd6..c1bc94e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
package org.apache.camel.component.salesforce;
-import org.junit.Before;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
index d042cbe..04b5fb3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
package org.apache.camel.component.salesforce;
-import org.junit.After;
import java.io.IOException;
import java.util.HashMap;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
index 08e2964..44c4d16 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
@@ -23,9 +23,7 @@ import java.util.Map;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.sun.xml.bind.v2.schemagen.xmlschema.Any;
-import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -38,8 +36,8 @@ import org.cometd.common.HashMapMessage;
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.ArgumentMatchers.same;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -237,7 +235,7 @@ public class SalesforceConsumerTest {
verify(in).setHeader("CamelSalesforceEventType", "TestEvent__e");
verify(in).setHeader("CamelSalesforcePlatformEventSchema", "30H2pgzuWcF844p26Ityvg");
- verify(processor).process(same(exchange), any()) ;
+ verify(processor).process(same(exchange), any());
verifyNoMoreInteractions(in, processor);
}