[PORTAL-7] Rebase

This rebasing includes common libraries and common overlays projects
abstraction of components

Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba
Signed-off-by: st782s <statta@research.att.com>

3 files changed, 0 insertions, 203 deletions

diff --git a/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/MockApplicationContextTestSuite.java b/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/MockApplicationContextTestSuite.java
deleted file mode 100644
index 0f918f6b..00000000
--- a/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/MockApplicationContextTestSuite.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.openecomp.portalsdk.core;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.openecomp.portalsdk.core.conf.AppConfig;
-import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager;
-import org.openecomp.portalsdk.core.util.CacheManager;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-
-
-/**
- * 
- * 
- * 
- * In order to write a unit test, 
- * 1. inherit this class - See SanityTest.java
- * 2. place the "war" folder on your test class's classpath
- * 3. run the test with the following VM argument; This is important because when starting the application from Container, the System Properties file (SystemProperties.java) can have the direct path
- *    but, when running from the Mock Junit container, the path should be prefixed with "classpath" to enable the mock container to search for the file in the classpath  
- *    -Dcontainer.classpath="classpath:"
- *
- */
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(loader = AnnotationConfigWebContextLoader.class, classes = {MockAppConfig.class})
-@ActiveProfiles(value="test")
-public class MockApplicationContextTestSuite {
-		
-	    @Autowired
-	    public WebApplicationContext wac;
-
-	    private MockMvc mockMvc;
-
-	    @Before
-	    public void setup() {
-	    	if(mockMvc == null) {
-	    		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-	    		
-	    	}
-	    }
-	    
-	    public Object getBean(String name) {
-			return this.wac.getBean(name);
-		}
-
-
-		public MockMvc getMockMvc() {
-			return mockMvc;
-		}
-
-		public void setMockMvc(MockMvc mockMvc) {
-			this.mockMvc = mockMvc;
-		}
-		
-		public WebApplicationContext getWebApplicationContext() {
-			return wac;
-		}
-		
-		
-		
-		
-}
-		
-
-		@Configuration
-		@ComponentScan(basePackages = "org.openecomp", 
-				 excludeFilters = {
-								 	
-								  }
-		    	)
-		@Profile("test")
-		class MockAppConfig extends AppConfig {
-			
-			@Bean 
-		    public SystemProperties systemProperties(){
-		    	return new MockSystemProperties();
-		    }
-			
-			@Bean
-		    public AbstractCacheManager cacheManager() {
-		        return new CacheManager() {
-		        	
-		        	public void configure() throws IOException {
-		        		 
-		        	}
-		        };
-		    }
-			
-			protected String[] tileDefinitions() {
-				return new String[] {"classpath:/WEB-INF/fusion/defs/definitions.xml", "classpath:/WEB-INF/defs/definitions.xml"};
-			}
-			
-			 @Override
-			public void addInterceptors(InterceptorRegistry registry) {
-			    //registry.addInterceptor(new SessionTimeoutInterceptor()).excludePathPatterns(getExcludeUrlPathsForSessionTimeout());
-			    //registry.addInterceptor(resourceInterceptor());
-			}
-			 
-			 public static class MockSystemProperties extends SystemProperties {
-					
-					public MockSystemProperties() {
-					}
-					
-				}
-					
-		}
-		
-		
-
-
diff --git a/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/MockHibernateMappingLocations.java b/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/MockHibernateMappingLocations.java
deleted file mode 100644
index a7de5159..00000000
--- a/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/MockHibernateMappingLocations.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.openecomp.portalsdk.core;
-
-
-
-import org.openecomp.portalsdk.core.conf.HibernateMappingLocatable;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
-
-@Component
-@Profile("test")
-public class MockHibernateMappingLocations implements HibernateMappingLocatable{
-	
-	public Resource[] getMappingLocations() {
-		return new Resource[]{new ClassPathResource("WEB-INF/fusion/orm/Fusion.hbm.xml"), new ClassPathResource("WEB-INF/fusion/orm/Workflow.hbm.xml")};
-	}
-     
-
-}
diff --git a/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/controller/sessionmgt/PortalCommunicationTest.java b/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/controller/sessionmgt/PortalCommunicationTest.java
deleted file mode 100644
index 3e14becb..00000000
--- a/ecomp-sdk/quantum/src/test/java/org/openecomp/portalsdk/core/controller/sessionmgt/PortalCommunicationTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.openecomp.portalsdk.core.controller.sessionmgt;
-/*package org.openecomp.portalsdk.core.controller.sessionmgt;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.mock.web.MockHttpSession;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-
-import org.openecomp.portalsdk.core.MockApplicationContextTestSuite;
-import org.openecomp.portalsdk.core.service.sessionmgt.CoreTimeoutHandler;
-
-public class PortalCommunicationTest extends MockApplicationContextTestSuite{
-	
-	
-	@Test
-	public void testGetTimeoutSessions() throws Exception {
-
-		MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get("/api/sessionTimeOuts");
-		MockHttpSession httpSession = new MockHttpSession(this.wac.getServletContext(),"1234");
-		CoreTimeoutHandler.sessionCreated("12", "1234", httpSession);
-		
-		ResultActions ra = this.getMockMvc().perform(requestBuilder);
-
-		System.out.println(" %%%%%%%%%%%%%%%%%%%%%%%%% " + ra.andReturn().getResponse().getContentAsString());
-		System.out.println(" %%%%%%%%%%%%%%%%%%%%%%%%% " + "{\"12\":{\"jSessionId\":\"1234\",\"sessionTimOutMilliSec\":");
-		
-		Assert.assertTrue(ra.andReturn().getResponse().getContentAsString().startsWith("{\"12\":{\"jSessionId\":\"1234\",\"sessionTimOutMilliSec\":"));
-
-	}
-	
-	@Test
-	public void testUpdateTimeoutSessions() throws Exception {
-		
-		// pre condition
-		MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get("/api/sessionTimeOuts");
-		MockHttpSession httpSession = new MockHttpSession(this.wac.getServletContext(),"1234");
-		CoreTimeoutHandler.sessionCreated("12", "1234", httpSession);
-		ResultActions ra = this.getMockMvc().perform(requestBuilder);
-	
-		String responseSessMapStr = ra.andReturn().getResponse().getContentAsString();
-		
-		
-		// test
-		requestBuilder = MockMvcRequestBuilders.post("/api/updateSessionTimeOuts");
-		requestBuilder.param("sessionMap", responseSessMapStr);
-		ra = this.getMockMvc().perform(requestBuilder);
-		
-		
-	}
-	
-	
-
-}
-*/
\ No newline at end of file