Skip to content

Commit 7394ce5

Browse files
authored
Merge branch 'main' into extract-vmlens-version
Signed-off-by: chrfwow <christian.lutnik@dynatrace.com>
2 parents f00847f + fb3144a commit 7394ce5

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

pom.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292

293293
<plugin>
294294
<artifactId>maven-compiler-plugin</artifactId>
295-
<version>3.14.0</version>
295+
<version>3.14.1</version>
296296
</plugin>
297297

298298
<plugin>
@@ -349,7 +349,7 @@
349349
</activation>
350350
<build>
351351
<plugins>
352-
<!--<plugin>
352+
<plugin>
353353
<groupId>com.vmlens</groupId>
354354
<artifactId>vmlens-maven-plugin</artifactId>
355355
<version>${com.vmlens.version}</version>
@@ -360,11 +360,14 @@
360360
<goal>test</goal>
361361
</goals>
362362
<configuration>
363+
<includes>
364+
<include>**/*CT.java</include>
365+
</includes>
363366
<failIfNoTests>true</failIfNoTests>
364367
</configuration>
365368
</execution>
366369
</executions>
367-
</plugin>-->
370+
</plugin>
368371
<plugin>
369372
<artifactId>maven-dependency-plugin</artifactId>
370373
<version>3.8.1</version>
@@ -612,7 +615,7 @@
612615
<plugin>
613616
<groupId>org.sonatype.central</groupId>
614617
<artifactId>central-publishing-maven-plugin</artifactId>
615-
<version>0.8.0</version>
618+
<version>0.9.0</version>
616619
<extensions>true</extensions>
617620
<configuration>
618621
<publishingServerId>central</publishingServerId>
@@ -744,7 +747,7 @@
744747
<plugin>
745748
<groupId>org.apache.maven.plugins</groupId>
746749
<artifactId>maven-compiler-plugin</artifactId>
747-
<version>3.14.0</version>
750+
<version>3.14.1</version>
748751
<executions>
749752
<execution>
750753
<id>default-testCompile</id>

src/test/java/dev/openfeature/sdk/e2e/steps/ProviderSteps.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.cucumber.java.en.Given;
2727
import io.cucumber.java.en.Then;
2828
import java.util.Map;
29-
import org.awaitility.Awaitility;
3029

3130
public class ProviderSteps {
3231
private final State state;
@@ -113,19 +112,15 @@ private void setupMockProvider(ErrorCode errorCode, String errorMessage, Provide
113112
switch (providerState) {
114113
case FATAL:
115114
case ERROR:
116-
mockProvider.emitProviderReady(details);
117-
mockProvider.emitProviderError(details);
115+
mockProvider.emitProviderReady(details).await();
116+
mockProvider.emitProviderError(details).await();
118117
break;
119118
case STALE:
120-
mockProvider.emitProviderReady(details);
121-
mockProvider.emitProviderStale(details);
119+
mockProvider.emitProviderReady(details).await();
120+
mockProvider.emitProviderStale(details).await();
122121
break;
123122
default:
124123
}
125-
Awaitility.await().until(() -> {
126-
ProviderState providerState1 = client.getProviderState();
127-
return providerState1 == providerState;
128-
});
129124
}
130125

131126
private void configureMockEvaluations(FeatureProvider mockProvider, ErrorCode errorCode, String errorMessage) {

src/test/java/dev/openfeature/sdk/vmlens/VmLensTest.java renamed to src/test/java/dev/openfeature/sdk/vmlens/VmLensCT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.jupiter.api.BeforeEach;
1919
import org.junit.jupiter.api.Test;
2020

21-
class VmLensTest {
21+
class VmLensCT {
2222
final OpenFeatureAPI api = OpenFeatureAPITestUtil.createAPI();
2323

2424
@BeforeEach

0 commit comments

Comments
 (0)