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/10/03 09:16:26 UTC
[camel] 09/09: Camel-AWS: Fix SNS test
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 dd5963c36f090a91d8cb79fbf1a347b4c98c68fd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:39:31 2018 +0200
Camel-AWS: Fix SNS test
---
.../org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java | 7 ++++---
.../org/apache/camel/component/aws/iam/AmazonIAMClientMock.java | 4 ++--
.../camel/component/aws/sns/SnsComponentConfigurationTest.java | 2 --
.../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 7 +++----
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
index 956329f..ff9502f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
@@ -21,7 +21,8 @@ import java.util.Collection;
import java.util.Iterator;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.ec2.AbstractAmazonEC2;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.ec2.AmazonEC2Client;
import com.amazonaws.services.ec2.model.CreateTagsRequest;
import com.amazonaws.services.ec2.model.CreateTagsResult;
import com.amazonaws.services.ec2.model.DeleteTagsRequest;
@@ -58,10 +59,10 @@ import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
import org.apache.camel.util.ObjectHelper;
-public class AmazonEC2ClientMock extends AbstractAmazonEC2 {
+public class AmazonEC2ClientMock extends AmazonEC2Client {
public AmazonEC2ClientMock() {
- super();
+ super(new BasicAWSCredentials("user", "secret"));
}
@Override
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
index 560ea70..d501188 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
@@ -24,7 +24,7 @@ import java.util.List;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
import com.amazonaws.regions.Region;
-import com.amazonaws.services.identitymanagement.AbstractAmazonIdentityManagement;
+import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClient;
import com.amazonaws.services.identitymanagement.model.AccessKey;
import com.amazonaws.services.identitymanagement.model.AccessKeyMetadata;
import com.amazonaws.services.identitymanagement.model.AddClientIDToOpenIDConnectProviderRequest;
@@ -275,7 +275,7 @@ import com.amazonaws.services.identitymanagement.model.UploadSigningCertificateR
import com.amazonaws.services.identitymanagement.model.User;
import com.amazonaws.services.identitymanagement.waiters.AmazonIdentityManagementWaiters;
-public class AmazonIAMClientMock extends AbstractAmazonIdentityManagement {
+public class AmazonIAMClientMock extends AmazonIdentityManagementClient {
@Override
public void setEndpoint(String endpoint) {
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
index 0e56469..41a9abd 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
@@ -85,8 +85,6 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
endpoint.start();
assertEquals("arn:aws:sns:us-east-1:541925086079:MyTopic", endpoint.getConfiguration().getTopicArn());
- // check the setting of AmazonSNSEndpoint
- assertEquals("https://sns.us-east-1.amazonaws.com", mock.getEndpoint());
endpoint.stop();
}
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 691900c..a1b3de6 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -30,8 +30,7 @@ import java.util.concurrent.TimeUnit;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.sqs.AmazonSQSClient;
+import com.amazonaws.services.sqs.AbstractAmazonSQS;
import com.amazonaws.services.sqs.model.ChangeMessageVisibilityRequest;
import com.amazonaws.services.sqs.model.ChangeMessageVisibilityResult;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
@@ -47,7 +46,7 @@ import com.amazonaws.services.sqs.model.SendMessageResult;
import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
import com.amazonaws.services.sqs.model.SetQueueAttributesResult;
-public class AmazonSQSClientMock extends AmazonSQSClient {
+public class AmazonSQSClientMock extends AbstractAmazonSQS {
List<Message> messages = new ArrayList<>();
Map<String, Map<String, String>> queueAttributes = new HashMap<>();
@@ -57,7 +56,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
private ScheduledExecutorService scheduler;
public AmazonSQSClientMock() {
- super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
+ super();
}
@Override