3 files changed, 62 insertions, 58 deletions
diff --git a/common/src/test/java/org/onap/so/client/dmaap/DmaapPublisherTest.java b/common/src/test/java/org/onap/so/client/dmaap/DmaapPublisherTest.java
deleted file mode 100644
index 4bfac38151..0000000000
--- a/common/src/test/java/org/onap/so/client/dmaap/DmaapPublisherTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 Huawei Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed 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.
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.client.dmaap;
-
-import org.junit.Test;
-import javax.ws.rs.ProcessingException;
-import java.io.IOException;
-import java.util.Optional;
-
-public class DmaapPublisherTest {
-
-    DmaapPublisher dmaapPublisher = new DmaapPublisher(120) {
-        @Override
-        public String getAuth() {
-            return "8F73A1691F6271E769329C176EE3EA48F52786AF12A3E16259007EED2A0F0CC3CB965F4AB5318483015723CCE1C0B48AB6C4DED6E251869393B01E4EC532FC88D4A128B92F4CDB34719B171923";
-        }
-
-        @Override
-        public String getKey() {
-            return "07a7159d3bf51a0e53be7a8f89699be7";
-        }
-
-        @Override
-        public String getTopic() {
-            return "test";
-        }
-
-        @Override
-        public Optional<String> getHost() {
-            return Optional.of("http://test");
-        }
-    };
-
-    public DmaapPublisherTest() throws IOException {}
-
-    @Test(expected = ProcessingException.class)
-    public void sendTest() throws Exception {
-        dmaapPublisher.send("{'key': 'value'}");
-    }
-
-}
diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java b/common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java
new file mode 100644
index 0000000000..e4b694cd15
--- /dev/null
+++ b/common/src/test/java/org/onap/so/serviceinstancebeans/ModelTypeTest.java
@@ -0,0 +1,38 @@
+package org.onap.so.serviceinstancebeans;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
+
+public class ModelTypeTest {
+
+
+
+    @Test
+    public void reflectionTest() {
+        TestServiceInstanceBean a = new TestServiceInstanceBean();
+        TestServiceInstanceBean b = new TestServiceInstanceBean();
+
+        a.setServiceInstanceId("my-id-a");
+        a.setServiceInstanceName("my-name-a");
+
+        b.setServiceInstanceId("my-id-b");
+        b.setServiceInstanceName("my-name-b");
+
+        assertEquals("my-id-a", ModelType.service.getId(a));
+        assertEquals("my-name-a", ModelType.service.getName(a));
+        ModelType.service.setName(a, ModelType.service.getName(b));
+        ModelType.service.setId(a, ModelType.service.getId(b));
+        assertEquals("my-name-b", ModelType.service.getName(a));
+        assertEquals("my-id-b", ModelType.service.getId(a));
+    }
+
+    @Test
+    public void testSilentFail() {
+        TestServiceInstanceBean a = new TestServiceInstanceBean();
+
+        a.setServiceInstanceId("my-id-a");
+        a.setServiceInstanceName("my-name-a");
+        assertNull(ModelType.service.get(a, "NoField"));
+    }
+}
diff --git a/common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java b/common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java
new file mode 100644
index 0000000000..b8cf6141e3
--- /dev/null
+++ b/common/src/test/java/org/onap/so/serviceinstancebeans/TestServiceInstanceBean.java
@@ -0,0 +1,24 @@
+package org.onap.so.serviceinstancebeans;
+
+public class TestServiceInstanceBean {
+
+    private String serviceInstanceId;
+    private String serviceInstanceName;
+
+    public String getServiceInstanceId() {
+        return serviceInstanceId;
+    }
+
+    public void setServiceInstanceId(String serviceInstanceId) {
+        this.serviceInstanceId = serviceInstanceId;
+    }
+
+    public String getServiceInstanceName() {
+        return serviceInstanceName;
+    }
+
+    public void setServiceInstanceName(String serviceInstanceName) {
+        this.serviceInstanceName = serviceInstanceName;
+    }
+
+}