Fix dashboard repo issue

Change-Id: I264bc0ec06bc308816bd96982efdfef28264978c
Issue-ID: CCSDK-196
Signed-off-by: Hong Guan <hg4105@att.com>

2 files changed, 195 insertions, 195 deletions

diff --git a/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java b/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
index f3d55e2..ccefdce 100644
--- a/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
+++ b/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
@@ -1,137 +1,137 @@
-/*******************************************************************************
- * =============LICENSE_START=========================================================
- *
- * =================================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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
- *  
- *      http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *******************************************************************************/
-package org.onap.fusion.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", "org.onap"}, excludeFilters = {
-		// see AppConfig class
-})
-@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() {
-		}
-
-	}
-
-}
+/*******************************************************************************

+ * =============LICENSE_START=========================================================

+ *

+ * =================================================================================

+ *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ *  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

+ *  

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *  

+ *  Unless required by applicable law or agreed to in writing, software

+ *  distributed under the License is distributed on an "AS IS" BASIS,

+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ *  See the License for the specific language governing permissions and

+ *  limitations under the License.

+ * ============LICENSE_END=========================================================

+ *

+ *  ECOMP is a trademark and service mark of AT&T Intellectual Property.

+ *******************************************************************************/

+package org.onap.fusion.core;

+

+import java.io.IOException;

+

+import org.junit.Before;

+import org.junit.runner.RunWith;

+import org.onap.portalsdk.core.conf.AppConfig;

+import org.onap.portalsdk.core.objectcache.AbstractCacheManager;

+import org.onap.portalsdk.core.util.CacheManager;

+import org.onap.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", "org.onap"}, excludeFilters = {

+		// see AppConfig class

+})

+@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/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java b/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
index 4a661da..ce00583 100644
--- a/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
+++ b/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
@@ -1,58 +1,58 @@
-/*******************************************************************************
- * =============LICENSE_START=========================================================
- *
- * =================================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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
- *  
- *      http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *******************************************************************************/
-package org.onap.fusionapp.service;
-
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.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);
-	}
-}
+/*******************************************************************************

+ * =============LICENSE_START=========================================================

+ *

+ * =================================================================================

+ *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ *  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

+ *  

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *  

+ *  Unless required by applicable law or agreed to in writing, software

+ *  distributed under the License is distributed on an "AS IS" BASIS,

+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ *  See the License for the specific language governing permissions and

+ *  limitations under the License.

+ * ============LICENSE_END=========================================================

+ *

+ *  ECOMP is a trademark and service mark of AT&T Intellectual Property.

+ *******************************************************************************/

+package org.onap.fusionapp.service;

+

+import java.util.List;

+

+import org.junit.Assert;

+import org.junit.Test;

+import org.onap.fusion.core.MockApplicationContextTestSuite;

+import org.onap.portalsdk.core.domain.Profile;

+import org.onap.portalsdk.core.domain.User;

+import org.onap.portalsdk.core.service.ProfileService;

+import org.onap.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() throws Exception {

+		

+		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);

+	}

+}