Portal Setup - App issue

Issue-ID: PORTAL-723
Change-Id: Iff1523b2a474f56a74c9fcb9fd850e0e38f6fc68
Signed-off-by: statta <statta@research.att.com>

2 files changed, 0 insertions, 363 deletions

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java
deleted file mode 100644
index 8db66b01..00000000
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *             https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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============================================
- *
- * 
- */
-package org.onap.portalapp.portal.controller;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.onap.portalapp.portal.controller.ConsulClientController;
-import org.onap.portalapp.portal.domain.BEProperty;
-import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
-import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
-import org.onap.portalapp.portal.framework.MockitoTestSuite;
-import org.onap.portalapp.portal.service.ConsulHealthService;
-import org.onap.portalapp.portal.service.ConsulHealthServiceImpl;
-
-import com.orbitz.consul.ConsulException;
-import com.orbitz.consul.model.health.ServiceHealth;
-
-import io.searchbox.client.config.exception.NoServerConfiguredException;
-
-public class ConsulClientControllerTest {
-
-	@Mock
-	ConsulHealthService consulHealthService = new ConsulHealthServiceImpl();
-
-	@InjectMocks
-	ConsulClientController consulClientController = new ConsulClientController();
-
-	NoServerConfiguredException noServerConfiguredException = new NoServerConfiguredException(null);
-
-	String service = "Test";
-
-	@Before
-	public void setup() {
-		MockitoAnnotations.initMocks(this);
-	}
-
-	MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
-
-	HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest();
-	HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
-	NullPointerException nullPointerException = new NullPointerException();
-	ConsulException consulException = new ConsulException(nullPointerException);
-
-	@Test
-	public void getServiceLocationTest() {
-		PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
-		ecpectedPortalRestResponse.setMessage("Success!");
-		ecpectedPortalRestResponse.setResponse(null);
-		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK);
-		PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
-		actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
-	}
-
-	@Test
-	public void getServiceLocationExceptionTest() {
-		PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
-		ecpectedPortalRestResponse.setMessage("Warning!");
-		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.WARN);
-		PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
-		Mockito.when(consulHealthService.getServiceLocation(service, null)).thenThrow(noServerConfiguredException);
-		actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.getMessage().equals(ecpectedPortalRestResponse.getMessage()));
-		assertTrue(actualPortalRestRespone.getStatus().equals(ecpectedPortalRestResponse.getStatus()));
-
-	}
-
-	@Test
-	public void getServiceLocationExceptionConsulExceptionTest() {
-		PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
-		ecpectedPortalRestResponse.setMessage("Error!");
-		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
-		PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
-		Mockito.when(consulHealthService.getServiceLocation(service, null)).thenThrow(consulException);
-		actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.getMessage().equals(ecpectedPortalRestResponse.getMessage()));
-		assertTrue(actualPortalRestRespone.getStatus().equals(ecpectedPortalRestResponse.getStatus()));
-	}
-
-	public PortalRestResponse<List<ServiceHealth>> successResponse() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = new PortalRestResponse<List<ServiceHealth>>();
-		List<ServiceHealth> healths = new ArrayList<ServiceHealth>();
-		ecpectedPortalRestResponse.setMessage("Success!");
-		ecpectedPortalRestResponse.setResponse(healths);
-		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK);
-		return ecpectedPortalRestResponse;
-	}
-
-	public PortalRestResponse<List<ServiceHealth>> errorResponse() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = new PortalRestResponse<List<ServiceHealth>>();
-		List<ServiceHealth> healths = new ArrayList<ServiceHealth>();
-		ecpectedPortalRestResponse.setMessage("Error!");
-		ecpectedPortalRestResponse.setResponse(healths);
-		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
-		return ecpectedPortalRestResponse;
-	}
-
-	@Test
-	public void getAllHealthyNodesTest() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = successResponse();
-		PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
-		actualPortalRestRespone = consulClientController.getAllHealthyNodes(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
-
-	}
-
-	@Test
-	public void getAllHealthyNodesExceptionTest() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = errorResponse();
-		PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
-		Mockito.when(consulHealthService.getAllHealthyNodes(service)).thenThrow(consulException);
-		actualPortalRestRespone = consulClientController.getAllHealthyNodes(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
-	}
-
-	@Test
-	public void getAllNodesTest() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = successResponse();
-		PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
-		actualPortalRestRespone = consulClientController.getAllNodes(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
-	}
-
-	@Test
-	public void getAllNodesExceptionTest() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = errorResponse();
-		PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
-		Mockito.when(consulHealthService.getAllNodes(service)).thenThrow(consulException);
-		actualPortalRestRespone = consulClientController.getAllNodes(mockedRequest, mockedResponse, service);
-		assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
-	}
-}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java
deleted file mode 100644
index 71bdb7c0..00000000
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *             https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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============================================
- *
- * 
- */
-package org.onap.portalapp.portal.service;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.onap.portalapp.portal.utils.EcompPortalUtils;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.HealthClient;
-import com.orbitz.consul.model.ConsulResponse;
-import com.orbitz.consul.model.health.ServiceHealth;
-import com.orbitz.consul.Consul.Builder;
-import com.orbitz.consul.model.health.Node;
-import com.orbitz.consul.model.health.Service;
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Consul.class ,EcompPortalUtils.class})
-public class ConsulHealthServiceImplTest {
-	
-	private static final String TEST="test";
-	@InjectMocks
-	ConsulHealthServiceImpl consulHealthServiceImpl;
-	
-	@Mock
-	Builder builder;
-	@Mock
-	Consul consul ;
-	@Mock
-	HealthClient healthClient;
-	@Mock
-	ServiceHealth serviceHealth;
-	@Mock
-	ConsulResponse<List<ServiceHealth>> response;
-	@Mock
-	Node node;
-	@Mock
-	Service service;
-	
-	@Before
-	public void setup() {
-		MockitoAnnotations.initMocks(this);
-	}
-	
-	@Test
-	public void getServiceLocation_Error() {
-		
-		PowerMockito.mockStatic(Consul.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.when(Consul.builder()).thenReturn(builder);
-		PowerMockito.when(EcompPortalUtils.localOrDockerHost()).thenReturn(TEST);
-		when(builder.build()).thenReturn(consul);
-		when(consul.healthClient()).thenReturn(healthClient);
-	String location=	consulHealthServiceImpl.getServiceLocation(TEST, TEST);
-	assertNotNull(location);
-		
-	}
-	
-	@Test
-	public void getServiceLocation_Empty() {
-		
-		List<ServiceHealth> nodes=new ArrayList<>();
-		nodes.add(serviceHealth);
-	
-		PowerMockito.mockStatic(Consul.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.when(Consul.builder()).thenReturn(builder);
-		PowerMockito.when(EcompPortalUtils.localOrDockerHost()).thenReturn(TEST);
-		when(builder.build()).thenReturn(consul);
-		when(consul.healthClient()).thenReturn(healthClient);
-		when( healthClient.getHealthyServiceInstances(TEST)).thenReturn(null);
-	
-		
-	String location=	consulHealthServiceImpl.getServiceLocation(TEST, TEST);
-	assertNotNull(location);
-		
-	}
-	
-	
-	@Test
-	public void getServiceLocation() {
-		
-		List<ServiceHealth> nodes=new ArrayList<>();
-		nodes.add(serviceHealth);
-	
-		PowerMockito.mockStatic(Consul.class);
-		PowerMockito.mockStatic(EcompPortalUtils.class);
-		PowerMockito.when(Consul.builder()).thenReturn(builder);
-		PowerMockito.when(EcompPortalUtils.localOrDockerHost()).thenReturn(TEST);
-		when(builder.build()).thenReturn(consul);
-		when(consul.healthClient()).thenReturn(healthClient);
-		when( healthClient.getHealthyServiceInstances(TEST)).thenReturn(response);
-		when(response.getResponse()).thenReturn(nodes);
-		when(serviceHealth.getNode()).thenReturn(node);
-		when(serviceHealth.getService()).thenReturn(service);
-		
-	String location=	consulHealthServiceImpl.getServiceLocation(TEST, TEST);
-	assertNotNull(location);
-		
-	}
-	
-	@Test
-	public void getAllHealthyNodes() {
-		List<ServiceHealth> nodes=new ArrayList<>();
-		nodes.add(serviceHealth);
-	
-		PowerMockito.mockStatic(Consul.class);
-		PowerMockito.when(Consul.builder()).thenReturn(builder);
-		
-		when(builder.build()).thenReturn(consul);
-		when(consul.healthClient()).thenReturn(healthClient);
-		when( healthClient.getHealthyServiceInstances(TEST)).thenReturn(response);
-		when(response.getResponse()).thenReturn(nodes);
-		List<ServiceHealth> list=	consulHealthServiceImpl.getAllHealthyNodes(TEST);
-		assertEquals(1, list.size());
-		
-	}
-	
-	@Test
-	public void getAllNodes() {
-		List<ServiceHealth> nodes=new ArrayList<>();
-		nodes.add(serviceHealth);
-	
-		PowerMockito.mockStatic(Consul.class);
-		PowerMockito.when(Consul.builder()).thenReturn(builder);
-		
-		when(builder.build()).thenReturn(consul);
-		when(consul.healthClient()).thenReturn(healthClient);
-		when( healthClient.getAllServiceInstances(TEST)).thenReturn(response);
-		when(response.getResponse()).thenReturn(nodes);
-		List<ServiceHealth> list=	consulHealthServiceImpl.getAllNodes(TEST);
-		assertEquals(1, list.size());
-	}
-
-}