From 13d5d23cf1e7fcd52244ef284019a0eb280bb14a Mon Sep 17 00:00:00 2001 From: Michal Kabaj Date: Wed, 3 Apr 2019 15:46:19 +0200 Subject: AaiController construction and test improvements - autowired on constructor instead of fields Change-Id: I6fbf179a3e0ce51e92d617d681ea63b6926bcb38 Issue-ID: VID-456 Signed-off-by: Michal Kabaj --- .../org/onap/vid/controller/AaiControllerTest.java | 48 ++++++++++++---------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'vid-app-common/src/test/java') diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java index 6d4508dbf..0abf6cd57 100644 --- a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java @@ -3,13 +3,14 @@ * VID * ================================================================================ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 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. @@ -20,33 +21,41 @@ package org.onap.vid.controller; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.mockito.InjectMocks; +import java.util.Map; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.vid.aai.AaiResponseTranslator; +import org.onap.vid.aai.util.AAIRestInterface; +import org.onap.vid.roles.RoleProvider; import org.onap.vid.services.AaiService; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.util.Map; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; +import org.onap.vid.utils.SystemPropertiesWrapper; +@RunWith(MockitoJUnitRunner.class) public class AaiControllerTest { - @InjectMocks - AaiController aaiController = new AaiController(); - @Mock - AaiService aaiService; + private AaiService aaiService; + @Mock + private AAIRestInterface aaiRestInterface; + @Mock + private RoleProvider roleProvider; + @Mock + private SystemPropertiesWrapper systemPropertiesWrapper; - @BeforeMethod - public void initMocks(){ - MockitoAnnotations.initMocks(this); + private AaiController aaiController; + + @Before + public void setUp(){ + aaiController = new AaiController(aaiService, aaiRestInterface, roleProvider, systemPropertiesWrapper); } @Test @@ -70,7 +79,4 @@ public class AaiControllerTest { "c", toBeReturnedForC ))); } - - - } -- cgit 1.2.3-korg