X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fmodel%2FTopicTest.java;h=5da3aedd7c132b19f278140fd124881f4575bac1;hb=13b3b39aab2e2894838587dca6b7f8c3f6649edf;hp=1f8b3b2d0e572540c5b5ef558d1a42be9b36c3c7;hpb=1ab29ec8a91e845a59a2990ca2fe17166111a458;p=dmaap%2Fdbcapi.git

diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/TopicTest.java b/src/test/java/org/onap/dmaap/dbcapi/model/TopicTest.java
index 1f8b3b2..5da3aed 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/model/TopicTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/TopicTest.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 IBM
+ * ================================================================================
  * 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
@@ -19,61 +21,67 @@
  */
 package org.onap.dmaap.dbcapi.model;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
+import org.onap.dmaap.dbcapi.model.DmaapObject.DmaapObject_Status;
+import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 
 public class TopicTest {
 
-	private static final String  fmt = "%24s: %s%n";
-
-	ReflectionHarness rh = new ReflectionHarness();
-
-	String f, t, d, e, o;
-
-	@Before
-	public void setUp() throws Exception {
-		f = "org.onap.dmaap.interestingTopic";
-		t = "interestingTopic";
-		d = "A so very interesting topic";
-		e = "Yes";
-		o = "m12345";
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-
-	@Test
-	public void test1() {
-
-
-		rh.reflect( "org.onap.dmaap.dbcapi.model.Topic", "get", null );	
-	
-	}
-
-	@Test
-	public void test2() {
-		String[] a = { "put", "view" };
-		Topic obj = new Topic( f, t, d, e, o );
-
-
-		assertTrue( f.equals( obj.getFqtn() ));
-		assertTrue( t.equals( obj.getTopicName() ));
-		assertTrue( d.equals( obj.getTopicDescription() ));
-		assertTrue( e.equals( obj.getTnxEnabled() ));
-		assertTrue( o.equals( obj.getOwner() ));
-	}
-
-	@Test
-	public void test3() {
-
-		String v = "Validate";
-		rh.reflect( "org.onap.dmaap.dbcapi.model.Topic", "set", v );
-	}
+    ReflectionHarness rh = new ReflectionHarness();
+
+    String f, t, d, e, o;
+
+    @Before
+    public void setUp() throws Exception {
+        f = "org.onap.dmaap.interestingTopic";
+        t = "interestingTopic";
+        d = "A so very interesting topic";
+        e = "Yes";
+        o = "m12345";
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void test1() {
+        rh.reflect("org.onap.dmaap.dbcapi.model.Topic", "get", null);
+    }
+
+    @Test
+    public void test2() {
+        Topic obj = new Topic(f, t, d, e, o);
+        assertTrue(f.equals(obj.getFqtn()));
+        assertTrue(t.equals(obj.getTopicName()));
+        assertTrue(d.equals(obj.getTopicDescription()));
+        assertTrue(e.equals(obj.getTnxEnabled()));
+        assertTrue(o.equals(obj.getOwner()));
+    }
+
+    @Test
+    public void test3() {
+        String v = "Validate";
+        rh.reflect("org.onap.dmaap.dbcapi.model.Topic", "set", v);
+    }
+
+    @Test
+    public void getNumClientsHavingMRClientListNull() {
+        Topic obj = new Topic(f, t, d, e, o);
+        obj.setClients(null);
+        assertEquals(0, obj.getNumClients());
+    }
+
+    @Test
+    public void testTopicInitializationWithInvalidJsonString() {
+        String json = "{\"key\":\"value\"";
+        Topic obj = new Topic(json);
+        assertEquals(DmaapObject_Status.INVALID, obj.getStatus());
+    }
 
 }