fixed RunOSGiContainerIntegrationTest by testing loading connectivity…

…-model classes Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · May 31, 2021 · 5f5649e · 5f5649e
1 parent 16f22b1
commit 5f5649e
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/java/src/test/java/org/eclipse/ditto/client/RunOSGiContainerIntegrationTest.java b/java/src/test/java/org/eclipse/ditto/client/RunOSGiContainerIntegrationTest.java
@@ -42,6 +42,13 @@
 import javax.inject.Inject;
 
 import org.atteo.classindex.ClassIndex;
+import org.eclipse.ditto.base.model.auth.AuthorizationContext;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.Jsonifiable;
+import org.eclipse.ditto.base.model.signals.announcements.Announcement;
+import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.EventRegistry;
 import org.eclipse.ditto.client.configuration.MessagingConfiguration;
 import org.eclipse.ditto.client.live.LiveThingHandle;
 import org.eclipse.ditto.client.live.messages.MessageSender;
@@ -51,32 +58,20 @@
 import org.eclipse.ditto.client.messaging.MessagingProviders;
 import org.eclipse.ditto.client.options.Options;
 import org.eclipse.ditto.client.twin.TwinThingHandle;
+import org.eclipse.ditto.connectivity.model.signals.announcements.ConnectionClosedAnnouncement;
+import org.eclipse.ditto.connectivity.model.signals.announcements.ConnectivityAnnouncement;
 import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.base.model.auth.AuthorizationContext;
-import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
-import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.json.Jsonifiable;
 import org.eclipse.ditto.jwt.model.JsonWebToken;
 import org.eclipse.ditto.messages.model.Message;
 import org.eclipse.ditto.messages.model.MessagesModelFactory;
+import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
+import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
 import org.eclipse.ditto.policies.model.PoliciesModelFactory;
-import org.eclipse.ditto.things.model.AttributesModelFactory;
-import org.eclipse.ditto.things.model.ThingsModelFactory;
+import org.eclipse.ditto.policies.model.signals.announcements.PolicyAnnouncement;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
-import org.eclipse.ditto.base.model.signals.announcements.Announcement;
-import org.eclipse.ditto.policies.model.signals.announcements.PolicyAnnouncement;
-import org.eclipse.ditto.base.model.signals.JsonParsable;
-import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
-import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
-import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
-import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
-import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
-import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommand;
-import org.eclipse.ditto.things.model.signals.commands.query.ThingQueryCommand;
-import org.eclipse.ditto.base.model.signals.events.Event;
-import org.eclipse.ditto.base.model.signals.events.EventRegistry;
+import org.eclipse.ditto.things.model.AttributesModelFactory;
+import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 import org.eclipse.ditto.thingsearch.model.signals.commands.subscription.CancelSubscription;
 import org.junit.Test;
@@ -248,6 +243,11 @@ public void shouldBeAbleToResolveBundlesOfUsedDependencies() {
         checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(MessageCommand.class));
         checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(MessageCommandResponse.class));
 
+        // ditto-connectivity-model:
+        LOG.info("Ensuring ditto-connectivity-model is usable from OSGi..");
+        checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(ConnectivityAnnouncement.class));
+        checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(ConnectionClosedAnnouncement.class));
+
         // ditto-protocol:
         LOG.info("Ensuring ditto-protocol is usable from OSGi..");
         checkBundleIsPresentInstalledAndActive(FrameworkUtil.getBundle(Adaptable.class));