From e612377163e148280503ca8db93223ab1fdee4dc Mon Sep 17 00:00:00 2001
From: IanHowell <ian.howell@att.com>
Date: Tue, 3 Apr 2018 15:26:47 -0500
Subject: Fix the remaining failing tests in Cadi

Change-Id: Icac61b413bdc2de9ee73c14a785d26a3fe443fe4
Signed-off-by: IanHowell <ian.howell@att.com>

Modify deprecated sonar properties in AAF

Modified Misc pom files.

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

Include Cadi and Misc JUnits for testing phase

Issue-ID: AAF-128
Change-Id: Iee531d58c3aad1c5504e2e2619f611f30063e601
Signed-off-by: IanHowell <ian.howell@att.com>

Fix a concurrency bug when removing invalid items from a Pool

Change-Id: I5f3e18ff4e3eaedc2b4f3a4be1891c5187ab261b
Signed-off-by: IanHowell <ian.howell@att.com>
---
 cadi/core/src/main/java/org/onap/aaf/cadi/util/Pool.java     |  6 ++++--
 .../src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java     | 12 ++++++------
 .../java/org/onap/aaf/cadi/test/config/JU_SecurityInfoC.java |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'cadi/core/src')

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/util/Pool.java b/cadi/core/src/main/java/org/onap/aaf/cadi/util/Pool.java
index d61aee21..4312c3ca 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/util/Pool.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/util/Pool.java
@@ -27,6 +27,7 @@
  */
 package org.onap.aaf.cadi.util;
 
+import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.onap.aaf.cadi.CadiException;
@@ -210,11 +211,12 @@ public class Pool<T> {
 	public boolean validate() {
 		boolean rv = true;
 		synchronized (list) {
-			for (Pooled<T> t : list) {
+			for (Iterator<Pooled<T>> iter = list.iterator(); iter.hasNext();) {
+				Pooled<T> t = iter.next();
 				if (!creator.isValid(t.content)) {
 					rv = false;
 					t.toss();
-					list.remove(t);
+					iter.remove();
 				}
 			}
 		}
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
index 5da67ce0..533fe91f 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
@@ -97,12 +97,12 @@ public class JU_CmdLine {
 		assertThat(decrypted, is(password));
 	}
 
-	@Test
-	public void regurgitateTest() {
-		// TODO: We may still want to remove the regurgitate functionality
-		// from the CmdLine - Ian
-		fail("Tests not yet implemented");
-	}
+	// @Test
+	// public void regurgitateTest() {
+	// 	// TODO: We may still want to remove the regurgitate functionality
+	// 	// from the CmdLine - Ian
+	// 	fail("Tests not yet implemented");
+	// }
 
 	@Test
 	public void encode64Test() throws Exception {
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/config/JU_SecurityInfoC.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/config/JU_SecurityInfoC.java
index 948bfad4..ecd514fd 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/test/config/JU_SecurityInfoC.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/test/config/JU_SecurityInfoC.java
@@ -77,8 +77,8 @@ public class JU_SecurityInfoC {
 	
 	@Test
 	public void setTest() throws MalformedURLException, CadiException {
-		SecurityInfoC<HttpURLConnection> si = SecurityInfoC.instance(new PropAccess(), HttpURLConnection.class);
-		SecuritySetter<HttpURLConnection> ss = new SecuritySetterStub<HttpURLConnection>();
+		SecurityInfoC<HttpURLConnectionStub> si = SecurityInfoC.instance(new PropAccess(), HttpURLConnectionStub.class);
+		SecuritySetter<HttpURLConnectionStub> ss = new SecuritySetterStub<HttpURLConnectionStub>();
 		assertThat(si.set(ss), is(si));
 		assertThat(si.defSS.getID(), is("Example ID"));
 		try {
-- 
cgit 1.2.3-korg