[ONAP-rebase] Rebase as 1.1.0-SNAPSHOT

Consolidate into a single maven project; no more separate model and client jars.

Change-Id: Ibbba982250b74c0dfd09ee1c65c0fb6c158dd632
Signed-off-by: Christopher Lott <cl778h@att.com>
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

4 files changed, 0 insertions, 103 deletions

diff --git a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/SanityTest.java b/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/SanityTest.java
deleted file mode 100644
index a5022f9..0000000
--- a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/SanityTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.openecomp.fusionapp;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.fusion.core.MockApplicationContextTestSuite;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-
-public class SanityTest extends MockApplicationContextTestSuite {	
-	
-	@Test
-	public void testGetAvailableRoles() throws Exception {
-		
-		ResultActions ra =getMockMvc().perform(MockMvcRequestBuilders.get("/api/roles"));
-		//Assert.assertEquals(UrlAccessRestrictedException.class,ra.andReturn().getResolvedException().getClass());
-		Assert.assertEquals("application/json",ra.andReturn().getResponse().getContentType());
-	}
-	
-
-}
diff --git a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/controller/CollaborationControllerTest.java b/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/controller/CollaborationControllerTest.java
deleted file mode 100644
index a0b219b..0000000
--- a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/controller/CollaborationControllerTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.openecomp.fusionapp.controller;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.fusion.core.MockApplicationContextTestSuite;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-
-public class CollaborationControllerTest extends MockApplicationContextTestSuite{
-	
-	@Test
-	public void testGetAvailableRoles() throws Exception {
-		MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get("/collaborate_list");
-		User user = new User();
-		user.setId(1l);
-		user.setOrgUserId("abc");
-		requestBuilder.sessionAttr(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME), user);
-		
-		ResultActions ra =getMockMvc().perform(requestBuilder);
-		Assert.assertEquals(2,ra.andReturn().getModelAndView().getModelMap().size());
-	}
-
-
-}
diff --git a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java b/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java
deleted file mode 100644
index 74cbd62..0000000
--- a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.openecomp.fusionapp.controller;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.fusion.core.MockApplicationContextTestSuite;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-
-public class NetMapTest extends MockApplicationContextTestSuite {
-	
-	@Test
-	public void testGetNetMap() throws Exception {
-		ResultActions ra =getMockMvc().perform(MockMvcRequestBuilders.get("/net_map"));
-		//Assert.assertEquals(UrlAccessRestrictedException.class,ra.andReturn().getResolvedException().getClass());
-		Assert.assertEquals("net_map_int",ra.andReturn().getModelAndView().getModel().get("frame_int"));
-	}
-	
-
-}
diff --git a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java b/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java
deleted file mode 100644
index 1e6d78c..0000000
--- a/dcae_dmaapbc_webapp/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openecomp.fusionapp.service;
-
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.fusion.core.MockApplicationContextTestSuite;
-import org.openecomp.portalsdk.core.domain.Profile;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.service.ProfileService;
-import org.openecomp.portalsdk.core.service.UserProfileService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-public class ProfileServiceTest extends MockApplicationContextTestSuite {
-	
-	@Autowired
-	ProfileService service;
-	
-	@Autowired
-	UserProfileService userProfileService;
-	
-	@Test
-	public void testFindAll() {
-		
-		List<Profile> profiles = service.findAll();
-		Assert.assertTrue(profiles.size() > 0);
-	}
-
-	@Test
-	public void testFindAllActive() {
-				
-		List<User> users = userProfileService.findAllActive();
-		List<User> activeUsers = userProfileService.findAllActive();
-		Assert.assertTrue(users.size() - activeUsers.size() >= 0);
-	}
-}