Skip to content

Commit b349cc3

Browse files
committed
test(flagd): rework e2e tests to new format
Signed-off-by: Simon Schrottner <[email protected]>
1 parent 8fb4194 commit b349cc3

33 files changed

+626
-1333
lines changed

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,13 @@
200200
<scope>test</scope>
201201
</dependency>
202202

203+
<dependency>
204+
<groupId>io.cucumber</groupId>
205+
<artifactId>cucumber-picocontainer</artifactId>
206+
<version>7.20.1</version>
207+
<scope>test</scope>
208+
</dependency>
209+
203210
<dependency>
204211
<groupId>org.awaitility</groupId>
205212
<artifactId>awaitility</artifactId>

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java

Lines changed: 0 additions & 100 deletions
This file was deleted.
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
package dev.openfeature.contrib.providers.flagd.e2e;
2+
3+
import dev.openfeature.contrib.providers.flagd.Config;
4+
import org.apache.logging.log4j.util.Strings;
5+
import org.jetbrains.annotations.NotNull;
6+
import org.testcontainers.containers.GenericContainer;
7+
import org.testcontainers.containers.Network;
8+
import org.testcontainers.containers.wait.strategy.Wait;
9+
import org.testcontainers.containers.wait.strategy.WaitStrategy;
10+
import org.testcontainers.utility.DockerImageName;
11+
import org.testcontainers.utility.MountableFile;
12+
13+
import java.io.File;
14+
import java.nio.file.Files;
15+
import java.util.List;
16+
17+
public class FlagdContainer extends GenericContainer<FlagdContainer> {
18+
private static final String version;
19+
private static final Network network = Network.newNetwork();
20+
21+
static {
22+
String path = "test-harness/version.txt";
23+
File file = new File(path);
24+
try {
25+
List<String> lines = Files.readAllLines(file.toPath());
26+
version = lines.get(0);
27+
} catch (Exception e) {
28+
throw new RuntimeException(e);
29+
}
30+
}
31+
32+
public FlagdContainer() {
33+
this("");
34+
}
35+
36+
public FlagdContainer(String feature) {
37+
super(generateContainerName(feature));
38+
this.withReuse(true);
39+
if (!"socket".equals(feature))
40+
this.addExposedPorts(8013, 8014, 8015, 8016);
41+
}
42+
43+
@Override
44+
public void start() {
45+
super.start();
46+
}
47+
48+
public int getPort(Config.Resolver resolver) {
49+
waitUntilContainerStarted();
50+
switch (resolver) {
51+
case RPC:
52+
return this.getMappedPort(8013);
53+
case IN_PROCESS:
54+
return this.getMappedPort(8015);
55+
default:
56+
throw new IllegalArgumentException("Unsupported resolver: " + resolver);
57+
}
58+
}
59+
60+
61+
/**
62+
* @return a {@link org.testcontainers.containers.GenericContainer} instance of envoy container using
63+
* flagd sync service as backend expose on port 9211
64+
*/
65+
public static GenericContainer envoy() {
66+
final String container = "envoyproxy/envoy:v1.31.0";
67+
return new GenericContainer(DockerImageName.parse(container))
68+
.withCopyFileToContainer(MountableFile.forClasspathResource("/envoy-config/envoy-custom.yaml"),
69+
"/etc/envoy/envoy.yaml")
70+
.withExposedPorts(9211)
71+
.withNetwork(network)
72+
.withNetworkAliases("envoy");
73+
}
74+
75+
public static @NotNull String generateContainerName(String feature) {
76+
String container = "ghcr.io/open-feature/flagd-testbed";
77+
if (!Strings.isBlank(feature)) {
78+
container += "-" + feature;
79+
}
80+
container += ":v" + version;
81+
return container;
82+
}
83+
}

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessCucumberTest.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessEnvoyCucumberTest.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessReconnectCucumberTest.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessSSLCucumberTest.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcCucumberTest.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcReconnectCucumberTest.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcSSLCucumberTest.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)