Bug 8415 related: TestBundleDiag API improved 17/56817/7
authorMichael Vorburger <vorburger@redhat.com>
Wed, 10 May 2017 23:55:40 +0000 (01:55 +0200)
committerStephen Kitt <skitt@redhat.com>
Tue, 16 May 2017 15:54:03 +0000 (15:54 +0000)
commitf0cb0cc30420285df40f4f4575a340cfa93604ec
tree78766231007ba5cf3d78f831b7795c51841b04ef
parent7980f99e6874247df63fe8bed836cf1d0ce4ca96
Bug 8415 related: TestBundleDiag API improved

required for https://git.opendaylight.org/gerrit/#/c/56749/

The implicit throws org.awaitility.core.ConditionTimeoutException and
java.lang.AssertionError were not great.. an AssertionError is special,
and more importantly Awaitility's ConditionTimeoutException is an
implementation detail.

Awaitility is actually bundled as a private OSGi embedded JAR-in-JAR,
which is a bit like shaded fat über JARs with relocation in non-OSGi
Java built by the maven-shade-plugin or maven-assembly-plugin; so it was
wrong to throw an exception from it to a consumer of this utility.

Therefore, this introduces a new SystemStateFailureException instead.

Change-Id: I7b48f5d39258a62c38a3fb8c98a6a35b97360276
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleDiagInfos.java
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleServiceSummaryMatcher.java
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtil.java
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemStateFailureException.java [new file with mode: 0644]
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/TestBundleDiag.java