aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject aries-containers git commit: Unit tests for Marathon binding
Date Thu, 15 Jun 2017 10:16:18 GMT
Repository: aries-containers
Updated Branches:
  refs/heads/master c2bd0528b -> d08424c40


Unit tests for Marathon binding


Project: http://git-wip-us.apache.org/repos/asf/aries-containers/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-containers/commit/d08424c4
Tree: http://git-wip-us.apache.org/repos/asf/aries-containers/tree/d08424c4
Diff: http://git-wip-us.apache.org/repos/asf/aries-containers/diff/d08424c4

Branch: refs/heads/master
Commit: d08424c40b87586a6e370715bb7b648751cd5e78
Parents: c2bd052
Author: David Bosschaert <davidb@apache.org>
Authored: Thu Jun 15 11:16:11 2017 +0100
Committer: David Bosschaert <davidb@apache.org>
Committed: Thu Jun 15 11:16:11 2017 +0100

----------------------------------------------------------------------
 .../containers/marathon/impl/ServiceImpl.java   |  2 +-
 .../marathon/impl/ServiceImplTest.java          | 71 ++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-containers/blob/d08424c4/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/ServiceImpl.java
b/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/ServiceImpl.java
index ce1ef99..182d4b4 100644
--- a/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/ServiceImpl.java
+++ b/containers-marathon/src/main/java/org/apache/aries/containers/marathon/impl/ServiceImpl.java
@@ -34,7 +34,7 @@ class ServiceImpl implements Service {
     private final String marathonAppID;
     private final Marathon marathonClient;
 
-    public ServiceImpl(Marathon marathon, App app, ServiceConfig cfg) {
+    ServiceImpl(Marathon marathon, App app, ServiceConfig cfg) {
         marathonClient = marathon;
         marathonAppID = app.getId();
         configuration = cfg;

http://git-wip-us.apache.org/repos/asf/aries-containers/blob/d08424c4/containers-marathon/src/test/java/org/apache/aries/containers/marathon/impl/ServiceImplTest.java
----------------------------------------------------------------------
diff --git a/containers-marathon/src/test/java/org/apache/aries/containers/marathon/impl/ServiceImplTest.java
b/containers-marathon/src/test/java/org/apache/aries/containers/marathon/impl/ServiceImplTest.java
new file mode 100644
index 0000000..e71d1f4
--- /dev/null
+++ b/containers-marathon/src/test/java/org/apache/aries/containers/marathon/impl/ServiceImplTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.containers.marathon.impl;
+
+import org.apache.aries.containers.ServiceConfig;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import mesosphere.marathon.client.Marathon;
+import mesosphere.marathon.client.model.v2.App;
+import mesosphere.marathon.client.model.v2.GetAppResponse;
+
+public class ServiceImplTest {
+    @Test
+    public void testDestroy() {
+        Marathon mc = Mockito.mock(Marathon.class);
+
+        ServiceConfig cfg = ServiceConfig.builder("svc1", "a/b/c:d").build();
+        App app = new App();
+        app.setId("mid1");
+        ServiceImpl svc = new ServiceImpl(mc, app, cfg);
+
+        assertSame(cfg, svc.getConfiguration());
+        Mockito.verifyNoMoreInteractions(mc);
+        svc.destroy();
+        Mockito.verify(mc, Mockito.timeout(1)).deleteApp("mid1");
+        Mockito.verifyNoMoreInteractions(mc);
+    }
+
+    @Test
+    public void testActualInstanceCount() {
+        App a = new App();
+        a.setInstances(3);
+        Marathon mc = Mockito.mock(Marathon.class);
+
+        GetAppResponse gar = getAppResponse(a);
+        Mockito.when(mc.getApp("mid1")).thenReturn(gar);
+
+        ServiceConfig cfg = ServiceConfig.builder("svc1", "a/b/c:d").build();
+        App app = new App();
+        app.setId("mid1");
+        ServiceImpl svc = new ServiceImpl(mc, app, cfg);
+
+        assertEquals(3, svc.getActualInstanceCount());
+    }
+
+    private GetAppResponse getAppResponse(App a) {
+        GetAppResponse gar = Mockito.mock(GetAppResponse.class);
+        Mockito.when(gar.getApp()).thenReturn(a);
+        return gar;
+    }
+}


Mime
View raw message