This repository has been archived by the owner on Jan 19, 2022. It is now read-only.
pubsub emulator rule moved to a separate project #2352
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>spring-cloud-gcp</artifactId> | ||
| <groupId>org.springframework.cloud</groupId> | ||
| <version>1.2.3.BUILD-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
|
|
||
| <artifactId>spring-cloud-gcp-test</artifactId> | ||
| <name>Spring Cloud GCP Test Support</name> | ||
| <description>Provides tools for testing Spring Cloud GCP projects</description> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-jcl</artifactId> | ||
| <scope>compile</scope> | ||
|
There was a problem hiding this comment. Compile scope is the default, you don't have to specify it. |
||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -14,7 +14,7 @@ | |||||
| * limitations under the License. | ||||||
| */ | ||||||
|
|
||||||
| package org.springframework.cloud.gcp.test; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| import java.io.BufferedReader; | ||||||
| import java.io.IOException; | ||||||
|
|
@@ -33,11 +33,10 @@ | |||||
|
|
||||||
| import org.apache.commons.logging.Log; | ||||||
| import org.apache.commons.logging.LogFactory; | ||||||
| import org.junit.Assert; | ||||||
| import org.junit.Assume; | ||||||
| import org.junit.rules.ExternalResource; | ||||||
|
|
||||||
| /** | ||||||
| * Rule for instantiating and tearing down a Pub/Sub emulator instance. | ||||||
| * | ||||||
|
|
@@ -87,7 +86,7 @@ public PubSubEmulator() { | |||||
| @Override | ||||||
| protected void before() throws IOException, InterruptedException { | ||||||
|
|
||||||
| Assume.assumeTrue("PubSubEmulator rule disabled. Please enable with -Dit.pubsub-emulator.", this.enableTests); | ||||||
|
There was a problem hiding this comment. I don't think that enabling it with There was a problem hiding this comment. It's an interesting question then to test whether the rule initialization or a test's If there is possibility of the rule running first, perhaps we can just document this flag well? There was a problem hiding this comment. We can also try not to implement JUnit test rule. |
||||||
|
|
||||||
| startEmulator(); | ||||||
| determineHostPort(); | ||||||
|
|
@@ -178,7 +177,7 @@ private void startEmulator() throws IOException, InterruptedException { | |||||
| .start(); | ||||||
| } | ||||||
| catch (IOException ex) { | ||||||
| Assert.fail("Gcloud not found; leaving host/port uninitialized."); | ||||||
| } | ||||||
|
|
||||||
| if (configPresent) { | ||||||
|
|
@@ -188,7 +187,6 @@ private void startEmulator() throws IOException, InterruptedException { | |||||
| else { | ||||||
| createConfig(); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -214,12 +212,12 @@ private void determineHostPort() throws IOException, InterruptedException { | |||||
| * to fail the test. | ||||||
| */ | ||||||
| private void createConfig() throws InterruptedException { | ||||||
| int attempts = 100; | ||||||
| while (!Files.exists(EMULATOR_CONFIG_PATH) && --attempts >= 0) { | ||||||
| Thread.sleep(1000); | ||||||
| } | ||||||
| if (attempts < 0) { | ||||||
| Assert.fail( | ||||||
| "Emulator could not be configured due to missing env.yaml. Are PubSub and beta tools installed?"); | ||||||
| } | ||||||
| } | ||||||
|
|
@@ -234,7 +232,7 @@ private void createConfig() throws InterruptedException { | |||||
| private void updateConfig(WatchService watchService) throws InterruptedException { | ||||||
| int attempts = 10; | ||||||
| while (--attempts >= 0) { | ||||||
| WatchKey key = watchService.poll(1, TimeUnit.SECONDS); | ||||||
|
|
||||||
| if (key != null) { | ||||||
| Optional<Path> configFilePath = key.pollEvents().stream() | ||||||
|
|
@@ -247,7 +245,7 @@ private void updateConfig(WatchService watchService) throws InterruptedException | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| Assert.fail("Configuration file update could not be detected"); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
testscope?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not in this case -- the test project itself is meant to be imported as test scope, but the rule extends a JUnit class, so it needs to be compile, not test scope.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we should consider making these utilities independent of JUnit. People use different test frameworks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make it generic so people can reuse it sounds good. Can you take into account that may some people will be able to contribute creating rules for junit4 or extension for junit5 specifically? Those can be issues with
ideal for contributionorhelp wanted. WDYT?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That a good idea! We should do that.