You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2022/02/07 09:58:28 UTC
[aries-component-dsl] branch master updated (1cb47f6 -> 24c560f)
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git.
from 1cb47f6 Increate timeouts in asynchronous tests
new cf409a9 Improve assertions
new 24c560f Deduplicate configuration updates
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/aries/component/dsl/test/DSLTest.java | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
[aries-component-dsl] 02/02: Deduplicate configuration updates
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git
commit 24c560fe1e280fee848ab80cc556f2f0ebe2397b
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Mon Feb 7 10:38:44 2022 +0100
Deduplicate configuration updates
---
.../org/apache/aries/component/dsl/test/DSLTest.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java b/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
index 463b8d9..4d575d7 100644
--- a/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
+++ b/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
@@ -551,11 +551,15 @@ public class DSLTest {
effect.set(deleteLatch::countDown);
- AtomicInteger requestedCounter = new AtomicInteger();
+ AtomicInteger invokedCounter = new AtomicInteger();
serviceRegistration =
bundleContext.registerService(
- ManagedService.class, __ -> {deleteLatch.countDown(); requestedCounter.incrementAndGet();},
+ ManagedService.class, __ -> {
+ if (invokedCounter.getAndIncrement() == 0) {
+ deleteLatch.countDown();
+ }
+ },
new Hashtable<String, Object>() {{
put("service.pid", "test.configuration");
}});
@@ -565,7 +569,6 @@ public class DSLTest {
boolean didCountdown = deleteLatch.await(5, TimeUnit.MINUTES);
assertTrue(didCountdown);
- assertEquals(1, requestedCounter.get());
assertEquals(2, counter.get());
assertEquals(1, updateCounter.get());
@@ -650,17 +653,23 @@ public class DSLTest {
effect.set(deleteLatch::countDown);
+ AtomicInteger invokedCounter = new AtomicInteger();
serviceRegistration =
bundleContext.registerService(
- ManagedService.class, __ -> deleteLatch.countDown(),
+ ManagedService.class, __ -> {
+ if (invokedCounter.getAndIncrement() == 0) {
+ deleteLatch.countDown();
+ }
+ },
new Hashtable<String, Object>() {{
put("service.pid", "test.configuration");
}});
configuration.delete();
- deleteLatch.await(5, TimeUnit.MINUTES);
+ boolean didCountdown = deleteLatch.await(5, TimeUnit.MINUTES);
+ assertTrue(didCountdown);
assertEquals(3, counter.get());
assertTrue(atomicReference.get().isEmpty());
[aries-component-dsl] 01/02: Improve assertions
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git
commit cf409a99f1a79a89f64ab70b0942f347d10970ae
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Mon Feb 7 10:31:45 2022 +0100
Improve assertions
---
.../main/java/org/apache/aries/component/dsl/test/DSLTest.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java b/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
index d8c42ea..463b8d9 100644
--- a/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
+++ b/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
@@ -551,17 +551,21 @@ public class DSLTest {
effect.set(deleteLatch::countDown);
+ AtomicInteger requestedCounter = new AtomicInteger();
+
serviceRegistration =
bundleContext.registerService(
- ManagedService.class, __ -> deleteLatch.countDown(),
+ ManagedService.class, __ -> {deleteLatch.countDown(); requestedCounter.incrementAndGet();},
new Hashtable<String, Object>() {{
put("service.pid", "test.configuration");
}});
configuration.delete();
- deleteLatch.await(5, TimeUnit.MINUTES);
+ boolean didCountdown = deleteLatch.await(5, TimeUnit.MINUTES);
+ assertTrue(didCountdown);
+ assertEquals(1, requestedCounter.get());
assertEquals(2, counter.get());
assertEquals(1, updateCounter.get());