Revert changes made to test classes
This commit is contained in:
parent
bb7d59518d
commit
ea54fdd6b9
2 changed files with 27 additions and 27 deletions
|
|
@ -14,28 +14,33 @@
|
||||||
*/
|
*/
|
||||||
package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
|
package com.amazonaws.services.kinesis.clientlibrary.lib.worker;
|
||||||
|
|
||||||
import com.amazonaws.auth.AWSStaticCredentialsProvider;
|
import java.util.ArrayList;
|
||||||
import com.amazonaws.auth.BasicAWSCredentials;
|
import java.util.Collections;
|
||||||
import com.amazonaws.client.builder.AwsClientBuilder;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
|
||||||
|
import com.amazonaws.services.kinesis.leases.impl.GenericLeaseSelector;
|
||||||
|
import com.amazonaws.services.kinesis.leases.interfaces.LeaseSelector;
|
||||||
|
import junit.framework.Assert;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
|
||||||
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
|
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
|
||||||
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
|
|
||||||
import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
|
import com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
|
||||||
import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
|
import com.amazonaws.services.kinesis.leases.exceptions.DependencyException;
|
||||||
import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
|
import com.amazonaws.services.kinesis.leases.exceptions.InvalidStateException;
|
||||||
import com.amazonaws.services.kinesis.leases.exceptions.LeasingException;
|
import com.amazonaws.services.kinesis.leases.exceptions.LeasingException;
|
||||||
import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
|
import com.amazonaws.services.kinesis.leases.exceptions.ProvisionedThroughputException;
|
||||||
import com.amazonaws.services.kinesis.leases.impl.GenericLeaseSelector;
|
|
||||||
import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
|
import com.amazonaws.services.kinesis.leases.impl.KinesisClientLease;
|
||||||
import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager;
|
import com.amazonaws.services.kinesis.leases.impl.KinesisClientLeaseManager;
|
||||||
import com.amazonaws.services.kinesis.leases.impl.Lease;
|
import com.amazonaws.services.kinesis.leases.impl.Lease;
|
||||||
import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer;
|
import com.amazonaws.services.kinesis.leases.interfaces.ILeaseRenewer;
|
||||||
import com.amazonaws.services.kinesis.leases.interfaces.LeaseSelector;
|
|
||||||
import junit.framework.Assert;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.notNullValue;
|
import static org.hamcrest.CoreMatchers.notNullValue;
|
||||||
import static org.hamcrest.MatcherAssert.assertThat;
|
import static org.hamcrest.MatcherAssert.assertThat;
|
||||||
|
|
@ -54,10 +59,7 @@ public class KinesisClientLibLeaseCoordinatorIntegrationTest {
|
||||||
final boolean useConsistentReads = true;
|
final boolean useConsistentReads = true;
|
||||||
LeaseSelector<KinesisClientLease> leaseSelector = new GenericLeaseSelector<>();
|
LeaseSelector<KinesisClientLease> leaseSelector = new GenericLeaseSelector<>();
|
||||||
if (leaseManager == null) {
|
if (leaseManager == null) {
|
||||||
AmazonDynamoDBClient ddb = (AmazonDynamoDBClient) AmazonDynamoDBClientBuilder.standard()
|
AmazonDynamoDBClient ddb = new AmazonDynamoDBClient(new DefaultAWSCredentialsProviderChain());
|
||||||
.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration("http://localhost:4566","us-east-1"))
|
|
||||||
.withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials("accessKey", "secretKey")))
|
|
||||||
.build();
|
|
||||||
leaseManager =
|
leaseManager =
|
||||||
new KinesisClientLeaseManager(TABLE_NAME, ddb, useConsistentReads,
|
new KinesisClientLeaseManager(TABLE_NAME, ddb, useConsistentReads,
|
||||||
KinesisClientLibConfiguration.DEFAULT_DDB_BILLING_MODE);
|
KinesisClientLibConfiguration.DEFAULT_DDB_BILLING_MODE);
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,10 @@
|
||||||
*/
|
*/
|
||||||
package com.amazonaws.services.kinesis.leases.impl;
|
package com.amazonaws.services.kinesis.leases.impl;
|
||||||
|
|
||||||
import com.amazonaws.auth.AWSStaticCredentialsProvider;
|
import java.util.logging.Logger;
|
||||||
import com.amazonaws.auth.BasicAWSCredentials;
|
|
||||||
import com.amazonaws.client.builder.AwsClientBuilder;
|
|
||||||
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
|
|
||||||
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
|
|
||||||
import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration;
|
import com.amazonaws.services.kinesis.clientlibrary.lib.worker.KinesisClientLibConfiguration;
|
||||||
import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
|
import com.amazonaws.services.kinesis.leases.exceptions.LeasingException;
|
||||||
import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory;
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.junit.Ignore;
|
import org.junit.Ignore;
|
||||||
|
|
@ -29,15 +25,17 @@ import org.junit.Rule;
|
||||||
import org.junit.rules.TestWatcher;
|
import org.junit.rules.TestWatcher;
|
||||||
import org.junit.runner.Description;
|
import org.junit.runner.Description;
|
||||||
|
|
||||||
|
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
|
||||||
|
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
|
||||||
|
import com.amazonaws.services.kinesis.metrics.impl.MetricsHelper;
|
||||||
|
import com.amazonaws.services.kinesis.metrics.impl.NullMetricsFactory;
|
||||||
|
|
||||||
@Ignore
|
@Ignore
|
||||||
public class LeaseIntegrationTest {
|
public class LeaseIntegrationTest {
|
||||||
|
|
||||||
protected static KinesisClientLeaseManager leaseManager;
|
protected static KinesisClientLeaseManager leaseManager;
|
||||||
protected static AmazonDynamoDBClient ddbClient =
|
protected static AmazonDynamoDBClient ddbClient =
|
||||||
(AmazonDynamoDBClient) AmazonDynamoDBClientBuilder.standard()
|
new AmazonDynamoDBClient(new DefaultAWSCredentialsProviderChain());
|
||||||
.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration("http://localhost:4566","us-east-1"))
|
|
||||||
.withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials("accessKey", "secretKey")))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
private static final Log LOG = LogFactory.getLog(LeaseIntegrationTest.class);
|
private static final Log LOG = LogFactory.getLog(LeaseIntegrationTest.class);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue