[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>

1 files changed, 0 insertions, 27 deletions

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());
-	}
-
-
-}