Skip to content

test: fix flaky SpringAnnotationCompatibilityTest.shouldSupportAnnotationAndMultipleConfig #142

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

Open
Shawyeok wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −9
Open

test: fix flaky SpringAnnotationCompatibilityTest.shouldSupportAnnotationAndMultipleConfig #142

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...test/java/com/ctrip/framework/apollo/compat/spring/SpringAnnotationCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,13 @@ public void shouldSupportAnnotationAndMultipleConfig() throws Exception {
assertNotNull(anotherAppChange);
assertNotNull(anotherAppChange.getChange("compat.origin"));

String namespace = apolloEventListenerProbe.pollNamespace(10, TimeUnit.SECONDS);
assertEquals("application", namespace);
// config change listeners are notified asynchronously, so events from different
// namespaces may arrive in any order
SpringCompatibilityTestSupport.waitForCondition(
"ApplicationListener should receive namespace updates",
() -> apolloEventListenerProbe.hasNamespace("application")
&& apolloEventListenerProbe.hasNamespace("TEST1.apollo")
&& apolloEventListenerProbe.hasNamespace("application.yaml"));

SpringCompatibilityTestSupport.waitForCondition("public value should be updated",
() -> "from-public-updated".equals(
Expand Down
14 changes: 7 additions & 7 deletions ...rc/test/java/com/ctrip/framework/apollo/compat/spring/SpringApolloEventListenerProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
package com.ctrip.framework.apollo.compat.spring;

import com.ctrip.framework.apollo.spring.events.ApolloConfigChangeEvent;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;

public class SpringApolloEventListenerProbe implements ApplicationListener {

private final BlockingQueue<String> namespaces = new LinkedBlockingQueue<String>();
private final Set<String> namespaces = Collections.synchronizedSet(new HashSet<String>());

@Override
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof ApolloConfigChangeEvent) {
namespaces.offer(((ApolloConfigChangeEvent) event).getConfigChangeEvent().getNamespace());
namespaces.add(((ApolloConfigChangeEvent) event).getConfigChangeEvent().getNamespace());
}
}

public String pollNamespace(long timeout, TimeUnit unit) throws InterruptedException {
return namespaces.poll(timeout, unit);
public boolean hasNamespace(String namespace) {
return namespaces.contains(namespace);
}
}
Loading