Move common code to router-core from DR

[aai/data-router.git] / src / test / java / org / onap / aai / datarouter / entity / AaiEventEntityTest.java

diff --git a/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java b/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java
index 413fd74..1f71dcd 100644 (file)
--- a/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java
+++ b/src/test/java/org/onap/aai/datarouter/entity/AaiEventEntityTest.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================\r
  * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
- * Copyright © 2017 Amdocs\r
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright © 2017-2018 Amdocs\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -17,14 +17,12 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
- *\r
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.onap.aai.datarouter.entity;\r
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.aai.datarouter.util.CrossEntityReference;\r
+import org.onap.aai.util.CrossEntityReference;\r
 \r
 import java.io.IOException;\r
 import java.security.NoSuchAlgorithmException;\r
@@ -97,34 +95,6 @@ public class AaiEventEntityTest {
         Assert.assertNotNull(entity.toString());\r
     }\r
 \r
-    @Test\r
-    public void testOxmEntityDescriptor(){\r
-        OxmEntityDescriptor descriptor = new OxmEntityDescriptor();\r
-        descriptor.setEntityName("entity-1");\r
-        Assert.assertEquals(descriptor.getEntityName(), "entity-1");\r
-\r
-        descriptor.setPrimaryKeyAttributeName(new ArrayList<String>());\r
-        Assert.assertTrue(descriptor.getPrimaryKeyAttributeName().size()==0);\r
-\r
-        Assert.assertFalse(descriptor.hasSearchableAttributes());\r
-\r
-        List<String> searchableAttr = new ArrayList<String>();\r
-        searchableAttr.add("search");\r
-        descriptor.setSearchableAttributes(searchableAttr);\r
-        Assert.assertTrue(descriptor.getSearchableAttributes().size()==1);\r
-\r
-        Assert.assertTrue(descriptor.hasSearchableAttributes());\r
-\r
-        CrossEntityReference ref = new CrossEntityReference();\r
-        descriptor.setCrossEntityReference(ref);\r
-        Assert.assertEquals(descriptor.getCrossEntityReference(), ref);\r
-\r
-        descriptor.setSuggestableEntity(true);\r
-        Assert.assertTrue(descriptor.isSuggestableEntity());\r
-\r
-        Assert.assertNotNull(descriptor.toString());\r
-    }\r
-\r
     @Test\r
     public void testPolicyResponse(){\r
         PolicyResponse response = new PolicyResponse(PolicyResponse.ResponseType.SUCCESS, "response-data");\r