Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Test robustness improvement

Rich Turner8becd0b6d6b0
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
index 76a005bcf..df6d92610 100644
--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
@@ -74,6 +74,10 @@ trait ContainerTrait {
Container startContainer(Map<String, String> config, Iterable<ContainerService> services) {
+ // Reset and start clock in case any previous tests stopped/modified it (pseudo clock is static so shared between tests)
+ TimerService.Clock.PSEUDO.reset()
+ TimerService.Clock.PSEUDO.advanceTime(-1, TimeUnit.MILLISECONDS) // Put time back so attribute events with the same timestamp as provisioned assets don't get rejected
+
if (container != null) {
// Compare config and services
def configsMatch = false
@@ -116,14 +120,6 @@ trait ContainerTrait {
gatewayClientService.deleteConnections(gatewayConnections.stream().map { it.localRealm }.collect(Collectors.toList()))
}
- // Reset and start clock in case previous test stopped it
- def timerService = container.getService(TimerService.class)
- if (timerService != null) {
- timerService.getClock().reset()
- timerService.getClock().advanceTime(-1, TimeUnit.MILLISECONDS) // Put time back so attribute events with the same timestamp don't get rejected
- timerService.getClock().start()
- }
-
// Reset rulesets
if (container.hasService(RulesetStorageService.class) && container.hasService(RulesService.class)) {
def globalRulesets = getRulesets(GlobalRuleset.class)
@@ -187,19 +183,6 @@ trait ContainerTrait {
}
Thread.sleep(100)
}
-
- if (!TestFixture.assetRulesets.isEmpty()) {
- println("Re-inserting ${TestFixture.assetRulesets.size()} asset ruleset(s)")
- TestFixture.assetRulesets.forEach { rulesetStorageService.merge(it) }
- }
- if (!TestFixture.tenantRulesets.isEmpty()) {
- println("Re-inserting ${TestFixture.tenantRulesets.size()} tenant ruleset(s)")
- TestFixture.tenantRulesets.forEach { rulesetStorageService.merge(it) }
- }
- if (!TestFixture.globalRulesets.isEmpty()) {
- println("Re-inserting ${TestFixture.globalRulesets.size()} global ruleset(s)")
- TestFixture.globalRulesets.forEach { rulesetStorageService.merge(it) }
- }
}
// Reset assets
@@ -236,6 +219,24 @@ trait ContainerTrait {
}
}
}
+
+ // Re-insert rulesets (after assets have been re-inserted)
+ if (container.hasService(RulesetStorageService.class) && container.hasService(RulesService.class)) {
+ def rulesetStorageService = container.getService(RulesetStorageService.class)
+
+ if (!TestFixture.assetRulesets.isEmpty()) {
+ println("Re-inserting ${TestFixture.assetRulesets.size()} asset ruleset(s)")
+ TestFixture.assetRulesets.forEach { rulesetStorageService.merge(it) }
+ }
+ if (!TestFixture.tenantRulesets.isEmpty()) {
+ println("Re-inserting ${TestFixture.tenantRulesets.size()} tenant ruleset(s)")
+ TestFixture.tenantRulesets.forEach { rulesetStorageService.merge(it) }
+ }
+ if (!TestFixture.globalRulesets.isEmpty()) {
+ println("Re-inserting ${TestFixture.globalRulesets.size()} global ruleset(s)")
+ TestFixture.globalRulesets.forEach { rulesetStorageService.merge(it) }
+ }
+ }
} catch (IllegalStateException e) {
System.out.println("Failed to clean the existing container so creating a new one")
stopContainer()
@@ -321,6 +322,10 @@ trait ContainerTrait {
}
}
+ // Reset and start clock in case any previous tests stopped/modified it (pseudo clock is static so shared between tests)
+ TimerService.Clock.PSEUDO.reset()
+ TimerService.Clock.PSEUDO.advanceTime(10, TimeUnit.MILLISECONDS) // Advance clock so attribute events from tests will succeed (even if actual clock hasn't moved more than a millisecond)
+
return container
}