Update junits for locate and gui

Issue-ID: AAF-111
Change-Id: Ie13e13b825d1f3be04fc65ab980806d2f0fdbffc
Signed-off-by: Sai Gandham <sg481n@att.com>

5 files changed, 208 insertions, 142 deletions

diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java
index 03b3ec68..31876fef 100644
--- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java
+++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/JU_BasicAuthCodeTest.java
@@ -18,7 +18,6 @@
  * ============LICENSE_END====================================================

  *

  */

-

 package org.onap.aaf.auth.locate;

 

 import static org.junit.Assert.assertEquals;

@@ -42,75 +41,74 @@ import org.onap.aaf.cadi.principal.X509Principal;
 import org.onap.aaf.misc.env.LogTarget;

 

 public class JU_BasicAuthCodeTest {

+	@Mock

+	AAFAuthn authn;

 

-    @Mock

-    AAFAuthn authn;

-

-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

-    AuthzTrans trans;

+	@Mock(answer = Answers.RETURNS_DEEP_STUBS)

+	AuthzTrans trans;

 

-    @Mock

-    HttpServletRequest req;

+	@Mock

+	HttpServletRequest req;

 

-    @Mock

-    HttpServletResponse resp;

+	@Mock

+	HttpServletResponse resp;

 

-    @Mock

-    LogTarget error;

+	@Mock

+	LogTarget error;

 

-    @Mock

-    LocateFacade facade;

+	@Mock

+	LocateFacade facade;

 

-    @Mock

-    BasicPrincipal basicPrincipal;

-    @Mock

-    X509Principal x509Principal;

+	@Mock

+	BasicPrincipal basicPrincipal;

+	@Mock

+	X509Principal x509Principal;

 

-    @Before

-    public void setUp() throws Exception {

-        initMocks(this);

-    }

+	@Before

+	public void setUp() throws Exception {

+		initMocks(this);

+	}

 

-    @Test

-    public void testWithNullUserPrincipal() throws Exception {

-        BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade);

-        LocateCode locateCode = basicAuthCode.clone(facade, false);

+	@Test

+	public void testWithNullUserPrincipal() throws Exception {

+		BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade);

+		LocateCode locateCode = basicAuthCode.clone(facade, false);

 

-        assertEquals(locateCode.desc(), basicAuthCode.desc());

+		assertEquals(locateCode.desc(), basicAuthCode.desc());

 

-        when(trans.getUserPrincipal()).thenReturn(null);

-        when(trans.error()).thenReturn(error);

+		when(trans.getUserPrincipal()).thenReturn(null);

+		when(trans.error()).thenReturn(error);

 

-        basicAuthCode.handle(trans, req, resp);

-    }

+		basicAuthCode.handle(trans, req, resp);

+	}

 

-    @Test

-    public void testWithBasicUserPrincipal() throws Exception {

-        BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade);

-        LocateCode locateCode = basicAuthCode.clone(facade, false);

+	@Test

+	public void testWithBasicUserPrincipal() throws Exception {

+		BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade);

+		LocateCode locateCode = basicAuthCode.clone(facade, false);

 

-        assertEquals(locateCode.desc(), basicAuthCode.desc());

+		assertEquals(locateCode.desc(), basicAuthCode.desc());

 

-        when(trans.getUserPrincipal()).thenReturn(basicPrincipal);

+		when(trans.getUserPrincipal()).thenReturn(basicPrincipal);

 

-        basicAuthCode.handle(trans, req, resp);

+		basicAuthCode.handle(trans, req, resp);

 

-        verify(resp).setStatus(HttpStatus.OK_200);

-    }

+		verify(resp).setStatus(HttpStatus.OK_200);

+	}

 

-    @Test

-    public void testWithX509UserPrincipal() throws Exception {

-        BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade);

-        LocateCode locateCode = basicAuthCode.clone(facade, false);

+	@Test

+	public void testWithX509UserPrincipal() throws Exception {

+		BasicAuthCode basicAuthCode = new BasicAuthCode(authn, facade);

+		LocateCode locateCode = basicAuthCode.clone(facade, false);

 

-        assertEquals(locateCode.desc(), basicAuthCode.desc());

+		assertEquals(locateCode.desc(), basicAuthCode.desc());

 

-        when(trans.getUserPrincipal()).thenReturn(x509Principal);

-        when(req.getHeader("Authorization")).thenReturn("Basic 76//76");

+		when(trans.getUserPrincipal()).thenReturn(x509Principal);

+		when(req.getHeader("Authorization")).thenReturn("Basic 76//76");

 

-        basicAuthCode.handle(trans, req, resp);

+		basicAuthCode.handle(trans, req, resp);

 

-        verify(resp).setStatus(HttpStatus.FORBIDDEN_403);

-    }

+		verify(resp).setStatus(HttpStatus.FORBIDDEN_403);

+	}

 

 }

diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java
new file mode 100644
index 00000000..ef8a1dc4
--- /dev/null
+++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/api/JU_API_AAFTest.java
@@ -0,0 +1,71 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 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====================================================
+ *
+ */
+package org.onap.aaf.auth.locate.api;
+
+import static org.junit.Assert.fail;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.onap.aaf.auth.locate.AAF_Locate;
+import org.onap.aaf.auth.locate.facade.LocateFacade;
+
+public class JU_API_AAFTest {
+
+	@Mock(answer = Answers.RETURNS_DEEP_STUBS)
+	private AAF_Locate gwAPI;
+	@Mock(answer = Answers.RETURNS_DEEP_STUBS)
+	private LocateFacade facade;
+
+	@Before
+	public void setUp() throws Exception {
+		initMocks(this);
+	}
+
+	@Test
+	public void testAPI_AAFAccess() throws Exception {
+		try {
+			API_AAFAccess.init(gwAPI, facade);
+		} catch (Exception e) {
+			fail("There should be no exception as Mocks are used");
+		}
+	}
+
+	@Test
+	public void testAPI_Find() throws Exception {
+		try {
+			API_Find.init(gwAPI, facade);
+		} catch (Exception e) {
+			fail("There should be no exception as Mocks are used");
+		}
+	}
+
+	@Test
+	public void testAPI_API() throws Exception {
+		try {
+			API_Api.init(gwAPI, facade);
+		} catch (Exception e) {
+			fail("There should be no exception as Mocks are used");
+		}
+	}
+}
diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java
index 37db5edc..26bea940 100644
--- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java
+++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/mapper/JU_Mapper_1_0Test.java
@@ -18,7 +18,6 @@
  * ============LICENSE_END====================================================

  *

  */

-

 package org.onap.aaf.auth.locate.mapper;

 

 import static org.junit.Assert.assertEquals;

@@ -36,31 +35,31 @@ import locate_local.v1_0.Out;
 

 public class JU_Mapper_1_0Test {

 

-    @Before

-    public void setUp() throws Exception {

+	@Before

+	public void setUp() throws Exception {

 

-    }

+	}

 

-    @Test

-    public void testGetClasses() {

-        Mapper_1_1 mapper = new Mapper_1_1();

-        assertEquals(InRequest.class, mapper.getClass(API.IN_REQ));

-        assertEquals(Out.class, mapper.getClass(API.OUT));

-        assertEquals(Error.class, mapper.getClass(API.ERROR));

-        assertEquals(Void.class, mapper.getClass(API.VOID));

-        assertEquals(Endpoints.class, mapper.getClass(API.ENDPOINTS));

-        assertEquals(MgmtEndpoints.class, mapper.getClass(API.MGMT_ENDPOINTS));

-    }

+	@Test

+	public void testGetClasses() {

+		Mapper_1_1 mapper = new Mapper_1_1();

+		assertEquals(InRequest.class, mapper.getClass(API.IN_REQ));

+		assertEquals(Out.class, mapper.getClass(API.OUT));

+		assertEquals(Error.class, mapper.getClass(API.ERROR));

+		assertEquals(Void.class, mapper.getClass(API.VOID));

+		assertEquals(Endpoints.class, mapper.getClass(API.ENDPOINTS));

+		assertEquals(MgmtEndpoints.class, mapper.getClass(API.MGMT_ENDPOINTS));

+	}

 

-    @Test

-    public void testNewInstance() {

-        Mapper_1_1 mapper = new Mapper_1_1();

-        assertTrue(mapper.newInstance(API.IN_REQ) instanceof InRequest);

-        assertTrue(mapper.newInstance(API.OUT) instanceof Out);

-        assertTrue(mapper.newInstance(API.ERROR) instanceof Error);

-        assertTrue(mapper.newInstance(API.ENDPOINTS) instanceof Endpoints);

-        assertTrue(mapper.newInstance(API.MGMT_ENDPOINTS) instanceof MgmtEndpoints);

-        assertEquals(null, mapper.newInstance(API.VOID));

-    }

+	@Test

+	public void testNewInstance() {

+		Mapper_1_1 mapper = new Mapper_1_1();

+		assertTrue(mapper.newInstance(API.IN_REQ) instanceof InRequest);

+		assertTrue(mapper.newInstance(API.OUT) instanceof Out);

+		assertTrue(mapper.newInstance(API.ERROR) instanceof Error);

+		assertTrue(mapper.newInstance(API.ENDPOINTS) instanceof Endpoints);

+		assertTrue(mapper.newInstance(API.MGMT_ENDPOINTS) instanceof MgmtEndpoints);

+		assertEquals(null, mapper.newInstance(API.VOID));

+	}

 

 }

diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java
index d6712e22..c66de60b 100644
--- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java
+++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/service/JU_LocateServiceImplTest.java
@@ -18,7 +18,6 @@
  * ============LICENSE_END====================================================

  *

  */

-

 package org.onap.aaf.auth.locate.service;

 

 import static org.junit.Assert.assertEquals;

@@ -45,71 +44,71 @@ import locate.v1_0.MgmtEndpoints;
 

 public class JU_LocateServiceImplTest {

 

-    // Extend, because I don't want a "setter" in the original.  Compromised with a protected...

-    private final class LocateServiceImplExtension extends LocateServiceImpl {

-        private LocateServiceImplExtension(AuthzTrans trans, AAF_Locate locate, Mapper mapper) throws APIException {

-            super(trans, locate, mapper);

-        }

-        public void set(LocateDAO ld) {

-            locateDAO=ld;

-        }

-    }

-

-    @Mock

-    private AuthzTrans trans;

-    @Mock

-    private AAF_Locate aaf_locate;

-    @Mock

-    private LocateDAO locateDAO;

-    @Mock

-    private Mapper mapper;

-    @Mock

-    private Result<List<Data>> result;

-    @Mock

-    private Result endPointResult;

-    @Mock

-    private MgmtEndpoints meps;

-    @Mock

-    private MgmtEndpoint mgmtEndPoint;

-

-    @Before

-    public void setup() {

-        MockitoAnnotations.initMocks(this);

-    }

-

-    @Test

-    public void test() throws APIException {

-        LocateServiceImplExtension locateServiceImpl = new LocateServiceImplExtension(trans, aaf_locate, mapper);

-        locateServiceImpl.set(locateDAO);

-

-        assertEquals(mapper, locateServiceImpl.mapper());

-

-        when(locateDAO.readByName(trans, "http")).thenReturn(result);

-        when(mapper.endpoints(result, "1.0", "other")).thenReturn(endPointResult);

-

-        Result output = locateServiceImpl.getEndPoints(trans, "http", "1.0", "other");

-

-        assertEquals(endPointResult, output);

-

-        List<MgmtEndpoint> mgmtEndPoints = new ArrayList<>();

-        mgmtEndPoints.add(mgmtEndPoint);

-

-        when(mgmtEndPoint.getName()).thenReturn("http.Endpoint1");

-        when(mgmtEndPoint.getHostname()).thenReturn("HOST1");

-        when(mgmtEndPoint.getPort()).thenReturn(9090);

-        when(mgmtEndPoint.getProtocol()).thenReturn("HTTP");

-

-        when(meps.getMgmtEndpoint()).thenReturn(mgmtEndPoints);

-        output = locateServiceImpl.putMgmtEndPoints(trans, meps);

-

-        assertEquals(output.toString(), Result.ok().toString());

-

-        when(trans.fish(any())).thenReturn(true);

-        Data data = new LocateDAO.Data();

-        when(mapper.locateData(mgmtEndPoint)).thenReturn(data);

-        output = locateServiceImpl.removeMgmtEndPoints(trans, meps);

-

-        assertEquals(output.toString(), Result.ok().toString());

-    }

+	// Extend, because I don't want a "setter" in the original.  Compromised with a protected...

+	private final class LocateServiceImplExtension extends LocateServiceImpl {

+		private LocateServiceImplExtension(AuthzTrans trans, AAF_Locate locate, Mapper mapper) throws APIException {

+			super(trans, locate, mapper);

+		}

+		public void set(LocateDAO ld) {

+			locateDAO=ld;

+		}

+	}

+

+	@Mock

+	private AuthzTrans trans;

+	@Mock

+	private AAF_Locate aaf_locate;

+	@Mock

+	private LocateDAO locateDAO;

+	@Mock

+	private Mapper mapper;

+	@Mock

+	private Result<List<Data>> result;

+	@Mock

+	private Result endPointResult;

+	@Mock

+	private MgmtEndpoints meps;

+	@Mock

+	private MgmtEndpoint mgmtEndPoint;

+

+	@Before

+	public void setup() {

+		MockitoAnnotations.initMocks(this);

+	}

+

+	@Test

+	public void test() throws APIException {

+		LocateServiceImplExtension locateServiceImpl = new LocateServiceImplExtension(trans, aaf_locate, mapper);

+		locateServiceImpl.set(locateDAO);

+

+		assertEquals(mapper, locateServiceImpl.mapper());

+

+		when(locateDAO.readByName(trans, "http")).thenReturn(result);

+		when(mapper.endpoints(result, "1.0", "other")).thenReturn(endPointResult);

+

+		Result output = locateServiceImpl.getEndPoints(trans, "http", "1.0", "other");

+

+		assertEquals(endPointResult, output);

+

+		List<MgmtEndpoint> mgmtEndPoints = new ArrayList<>();

+		mgmtEndPoints.add(mgmtEndPoint);

+

+		when(mgmtEndPoint.getName()).thenReturn("http.Endpoint1");

+		when(mgmtEndPoint.getHostname()).thenReturn("HOST1");

+		when(mgmtEndPoint.getPort()).thenReturn(9090);

+		when(mgmtEndPoint.getProtocol()).thenReturn("HTTP");

+

+		when(meps.getMgmtEndpoint()).thenReturn(mgmtEndPoints);

+		output = locateServiceImpl.putMgmtEndPoints(trans, meps);

+

+		assertEquals(output.toString(), Result.ok().toString());

+

+		when(trans.fish(any())).thenReturn(true);

+		Data data = new LocateDAO.Data();

+		when(mapper.locateData(mgmtEndPoint)).thenReturn(data);

+		output = locateServiceImpl.removeMgmtEndPoints(trans, meps);

+

+		assertEquals(output.toString(), Result.ok().toString());

+	}

 

 }

diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java
index 5f75a799..0339f318 100644
--- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java
+++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java
@@ -18,7 +18,6 @@
  * ============LICENSE_END====================================================

  *

  */

-

 package org.onap.aaf.auth.locate.validation;

 

 import static org.junit.Assert.assertEquals;