Bug 8415 related: Make TestBundleDiag a lib 50/57650/4
authorMichael Vorburger <vorburger@redhat.com>
Mon, 22 May 2017 22:04:07 +0000 (00:04 +0200)
committerRobert Varga <nite@hq.sk>
Mon, 29 May 2017 11:40:42 +0000 (11:40 +0000)
commit5a5c88b66af3e63532472ed02cfec99342369c07
tree2075cacdee6c52ab475c1eed958b333eadf07231
parentb3f6452b13964c5e14b42700c0b47b27657ad10c
Bug 8415 related: Make TestBundleDiag a lib

This is the alternative to c/56848 requested by Robert.

We're changing this so that we can consume bundles-test-lib in the
infrautils.ready implementation as a service for both Karaf v3 and v4.

As a (VERY nice!) side effect, this allows us to remove the duplicated
Java code we had between bundles-test and bundles4-test.  That was,
originally, intended to only be like it still is for a short while, but
with the Karaf 4 situation being what it is, this code duplication is
still there - and the respective code has started diverging a bit; so
unifying this in the new bundles-test-lib is great.

Change-Id: I0fd2c954fdc4a6c84505bef51729d15e4ba2888c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
28 files changed:
bundles-test-lib/pom.xml [new file with mode: 0644]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfos.java [new file with mode: 0644]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java [moved from bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleDiagInfos.java with 92% similarity]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleServiceSummaryMatcher.java [moved from bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleServiceSummaryMatcher.java with 70% similarity]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/ServiceReferenceUtil.java [moved from bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtil.java with 90% similarity]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/SystemState.java [moved from bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemState.java with 91% similarity]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/SystemStateFailureException.java [new file with mode: 0644]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TestBundleDiag.java [moved from bundles-test/src/main/java/org/opendaylight/odlparent/bundlestest/TestBundleDiag.java with 83% similarity]
bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/package-info.java [moved from bundles-test/src/main/java/org/opendaylight/odlparent/bundlestest/package-info.java with 86% similarity]
bundles-test-lib/src/test/java/org/opendaylight/odlparent/bundlestest/lib/ServiceReferenceUtilTest.java [moved from bundles-test/src/test/java/org/opendaylight/odlparent/bundlestest/ServiceReferenceUtilTest.java with 94% similarity]
bundles-test/pom.xml
bundles-test/src/main/java/org/opendaylight/odlparent/bundlestest/BundleDiagInfos.java [deleted file]
bundles-test/src/main/java/org/opendaylight/odlparent/bundlestest/BundleServiceSummaryMatcher.java [deleted file]
bundles-test/src/main/java/org/opendaylight/odlparent/bundlestest/ServiceReferenceUtil.java [deleted file]
bundles-test/src/main/java/org/opendaylight/odlparent/bundlestest/SystemState.java [deleted file]
bundles4-test/pom.xml
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemStateFailureException.java
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/TestBundleDiag.java
bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/package-info.java [deleted file]
bundles4-test/src/test/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtilTest.java [deleted file]
feature-repo-parent/pom.xml
feature3-repo-parent/pom.xml
features-test/pom.xml
features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
features4-test/pom.xml
features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
pom.xml
single-feature-parent/pom.xml