2 files changed, 0 insertions, 220 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/open/RoleGeneratorControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/open/RoleGeneratorControllerTest.java
deleted file mode 100644
index c1509d956..000000000
--- a/vid-app-common/src/test/java/org/onap/vid/controller/open/RoleGeneratorControllerTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright 2019 Nokia
- * ================================================================================
- * 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=========================================================
- */
-
-package org.onap.vid.controller.open;
-
-import static org.mockito.BDDMockito.given;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import org.apache.log4j.BasicConfigurator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.vid.controller.open.RoleGeneratorController;
-import org.onap.vid.services.RoleGeneratorService;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-
-@RunWith(MockitoJUnitRunner.class)
-public class RoleGeneratorControllerTest {
-
-    private static final String PATH = "/generateRoleScript/{firstRun}";
-
-    private static final String FIRST_JSON = "{key1: val1}";
-    private static final String SECOND_JSON = "{key2: val2}";
-
-    private RoleGeneratorController roleGeneratorController;
-    private MockMvc mockMvc;
-
-    @Mock
-    private RoleGeneratorService service;
-
-    @Before
-    public void setUp() {
-        roleGeneratorController = new RoleGeneratorController(service);
-        BasicConfigurator.configure();
-        mockMvc = MockMvcBuilders.standaloneSetup(roleGeneratorController).build();
-
-        given(service.generateRoleScript(true)).willReturn(FIRST_JSON);
-        given(service.generateRoleScript(false)).willReturn(SECOND_JSON);
-    }
-
-    @Test
-    public void generateRoleScript_shouldReturnJson_whenFirstRun() throws Exception {
-        mockMvc.perform(get(PATH, "true")
-            .contentType(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(FIRST_JSON));
-    }
-
-    @Test
-    public void generateRoleScript_shouldReturnJson_whenNoFirstRun() throws Exception {
-        mockMvc.perform(get(PATH, "false")
-            .contentType(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(SECOND_JSON));
-    }
-}
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/RoleGenaratorServiceImplTest.java b/vid-app-common/src/test/java/org/onap/vid/services/RoleGenaratorServiceImplTest.java
deleted file mode 100644
index 2bf73eece..000000000
--- a/vid-app-common/src/test/java/org/onap/vid/services/RoleGenaratorServiceImplTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2018 - 2019 Nokia. 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=========================================================
- */
-package org.onap.vid.services;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import java.util.ArrayList;
-import org.apache.commons.lang.StringUtils;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.onap.vid.aai.AaiClientInterface;
-import org.onap.vid.aai.AaiResponse;
-import org.onap.vid.aai.ServiceSubscription;
-import org.onap.vid.aai.ServiceSubscriptions;
-import org.onap.vid.aai.Services;
-import org.onap.vid.model.Subscriber;
-import org.onap.vid.model.SubscriberList;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-public class RoleGenaratorServiceImplTest {
-
-    private static final String GLOBAL_CUSTOMER_ID = "997";
-    private static final String SUBSCRIBER_NAME = "name";
-    private static final String SUBSCRIBER_TYPE = "subscriber_type";
-    private static final String RESOURCE_VERSION = "1";
-    private static final String SERVICE_TYPE = "service_type";
-
-    @Mock
-    private AaiClientInterface aaiClientInterface;
-
-    @InjectMocks
-    private RoleGenaratorServiceImpl testSubject;
-
-    @BeforeClass
-    public void beforeClass() {
-        initMocks(this);
-    }
-
-    @BeforeMethod
-    public void resetMocks() {
-        Mockito.reset(aaiClientInterface);
-    }
-
-    @Test
-    public void tenerateRoleScript_firstRun() {
-        boolean firstRun = true;
-
-        Subscriber subscriber = createSubscriber();
-        AaiResponse<SubscriberList> subscribers = createSubscriberListAaiResponse(subscriber);
-        doReturn(subscribers).when(aaiClientInterface).getAllSubscribers();
-
-        ServiceSubscription serviceSubscription = createServiceSubscription();
-        AaiResponse<Services> subscriberResponse = createServicesAaiResponse(serviceSubscription);
-        doReturn(subscriberResponse).when(aaiClientInterface).getSubscriberData(subscriber.globalCustomerId,false);
-
-        String result = testSubject.generateRoleScript(firstRun);
-        Assert.assertTrue(StringUtils.isNotBlank(result));
-    }
-
-    @Test
-    public void tenerateRoleScript_notAFirstRun() {
-        boolean firstRun = false;
-
-        Subscriber subscriber = createSubscriber();
-        AaiResponse<SubscriberList> subscribers = createSubscriberListAaiResponse(subscriber);
-        doReturn(subscribers).when(aaiClientInterface).getAllSubscribers();
-
-        ServiceSubscription serviceSubscription = createServiceSubscription();
-        AaiResponse<Services> subscriberResponse = createServicesAaiResponse(serviceSubscription);
-        doReturn(subscriberResponse).when(aaiClientInterface).getSubscriberData(subscriber.globalCustomerId, false);
-
-        String result = testSubject.generateRoleScript(firstRun);
-        Assert.assertTrue(StringUtils.isNotBlank(result));
-    }
-
-    @Test(expectedExceptions = { Exception.class })
-    public void tenerateRoleScript_errorGettingDataFromAAIClient() {
-        boolean firstRun = false;
-
-        doThrow(new Exception("This is expected.")).when(aaiClientInterface).getAllSubscribers();
-
-        String result = testSubject.generateRoleScript(firstRun);
-        Assert.fail();
-    }
-
-    private ServiceSubscription createServiceSubscription() {
-        ServiceSubscription serviceSubscription = new ServiceSubscription();
-        serviceSubscription.serviceType = SERVICE_TYPE;
-        return serviceSubscription;
-    }
-
-    private AaiResponse<SubscriberList> createSubscriberListAaiResponse(Subscriber subscriber) {
-        AaiResponse<SubscriberList> subscribers = new AaiResponse<>(new SubscriberList(new ArrayList<>()), "", 200);
-        subscribers.getT().customer.add(subscriber);
-        return subscribers;
-    }
-
-    private AaiResponse<Services> createServicesAaiResponse(ServiceSubscription serviceSubscription) {
-        AaiResponse<Services> subscriberResponse = new AaiResponse<>(new Services(), "", 200);
-        subscriberResponse.getT().serviceSubscriptions = new ServiceSubscriptions();
-        subscriberResponse.getT().serviceSubscriptions.serviceSubscription = new ArrayList<>();
-        subscriberResponse.getT().serviceSubscriptions.serviceSubscription.add(serviceSubscription);
-        return subscriberResponse;
-    }
-
-    private Subscriber createSubscriber() {
-        Subscriber subscriber = new Subscriber();
-        subscriber.globalCustomerId = GLOBAL_CUSTOMER_ID;
-        subscriber.subscriberName = SUBSCRIBER_NAME;
-        subscriber.subscriberType = SUBSCRIBER_TYPE;
-        subscriber.resourceVersion = RESOURCE_VERSION;
-        return subscriber;
-    }
-
-
-}