Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: reset resource ids before integration test retries #852

Merged
merged 1 commit into from Sep 22, 2021
Merged

fix: reset resource ids before integration test retries #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 14 additions & 9 deletions samples/snippets/src/test/java/pubsub/DeadLetterQueueIT.java
View file
Open in desktop
Expand Up @@ -44,15 +44,13 @@ public class DeadLetterQueueIT {
private PrintStream out;

private static final String projectId = System.getenv("GOOGLE_CLOUD_PROJECT");
private static final String _suffix = UUID.randomUUID().toString();
private static final String topicId = "topic-" + _suffix;
private static final String subscriptionId = "subscription-" + _suffix;
private static final String deadLetterTopicId = "topic-dlq-" + _suffix;
private static final ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId);
private static final ProjectTopicName deadLetterTopicName =
ProjectTopicName.of(projectId, deadLetterTopicId);
private static final ProjectSubscriptionName subscriptionName =
ProjectSubscriptionName.of(projectId, subscriptionId);
private static String _suffix;
private static String topicId;
private static String subscriptionId;
private static String deadLetterTopicId;
private static ProjectTopicName topicName;
private static ProjectTopicName deadLetterTopicName;
private static ProjectSubscriptionName subscriptionName;

private static void requireEnvVar(String varName) {
assertNotNull(
Expand All @@ -75,6 +73,13 @@ private static void publishSomeMessages() throws Exception {
@BeforeClass
public static void checkRequirements() {
requireEnvVar("GOOGLE_CLOUD_PROJECT");
_suffix = UUID.randomUUID().toString();
topicId = "topic-" + _suffix;
subscriptionId = "subscription-" + _suffix;
deadLetterTopicId = "topic-dlq-" + _suffix;
topicName = ProjectTopicName.of(projectId, topicId);
deadLetterTopicName = ProjectTopicName.of(projectId, deadLetterTopicId);
subscriptionName = ProjectSubscriptionName.of(projectId, subscriptionId);
}

@Before
Expand Down
41 changes: 26 additions & 15 deletions samples/snippets/src/test/java/pubsub/SchemaIT.java
View file
Open in desktop
Expand Up @@ -43,13 +43,13 @@ public class SchemaIT {
private PrintStream out;

private static final String projectId = System.getenv("GOOGLE_CLOUD_PROJECT");
private static final String _suffix = UUID.randomUUID().toString();
private static final String avroTopicId = "avro-topic-" + _suffix;
private static final String protoTopicId = "proto-topic-" + _suffix;
private static final String avroSubscriptionId = "avro-subscription-" + _suffix;
private static final String protoSubscriptionId = "proto-subscription-" + _suffix;
private static final String avroSchemaId = "avro-schema-" + _suffix;
private static final String protoSchemaId = "proto-schema-" + _suffix;
private static String _suffix;
private static String avroTopicId;
private static String protoTopicId;
private static String avroSubscriptionId;
private static String protoSubscriptionId;
private static String avroSchemaId;
private static String protoSchemaId;

ClassLoader classLoader = getClass().getClassLoader();
File avscFile = new File(classLoader.getResource("us-states.avsc").getFile());
Expand All @@ -58,14 +58,12 @@ public class SchemaIT {
File protoFile = new File(classLoader.getResource("us-states.proto").getFile());
String absoluteProtoFilePath = protoFile.getAbsolutePath();

private static final TopicName avroTopicName = TopicName.of(projectId, avroTopicId);
private static final TopicName protoTopicName = TopicName.of(projectId, protoTopicId);
private static final ProjectSubscriptionName avroSubscriptionName =
ProjectSubscriptionName.of(projectId, avroSubscriptionId);
private static final ProjectSubscriptionName protoSubscriptionName =
ProjectSubscriptionName.of(projectId, protoSubscriptionId);
private static final SchemaName avroSchemaName = SchemaName.of(projectId, avroSchemaId);
private static final SchemaName protoSchemaName = SchemaName.of(projectId, protoSchemaId);
private static TopicName avroTopicName;
private static TopicName protoTopicName;
private static ProjectSubscriptionName avroSubscriptionName;
private static ProjectSubscriptionName protoSubscriptionName;
private static SchemaName avroSchemaName;
private static SchemaName protoSchemaName;

private static void requireEnvVar(String varName) {
assertNotNull(
Expand All @@ -78,6 +76,19 @@ private static void requireEnvVar(String varName) {

@Before
public void setUp() {
_suffix = UUID.randomUUID().toString();
avroTopicId = "avro-topic-" + _suffix;
protoTopicId = "proto-topic-" + _suffix;
avroSubscriptionId = "avro-subscription-" + _suffix;
protoSubscriptionId = "proto-subscription-" + _suffix;
avroSchemaId = "avro-schema-" + _suffix;
protoSchemaId = "proto-schema-" + _suffix;
avroTopicName = TopicName.of(projectId, avroTopicId);
protoTopicName = TopicName.of(projectId, protoTopicId);
avroSubscriptionName = ProjectSubscriptionName.of(projectId, avroSubscriptionId);
protoSubscriptionName = ProjectSubscriptionName.of(projectId, protoSubscriptionId);
avroSchemaName = SchemaName.of(projectId, avroSchemaId);
protoSchemaName = SchemaName.of(projectId, protoSchemaId);
bout = new ByteArrayOutputStream();
out = new PrintStream(bout);
System.setOut(out);
Expand Down