2 files changed, 49 insertions, 3 deletions
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java
index 1681f435..fa62fe4e 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java
@@ -27,8 +27,6 @@ import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.Holder;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -40,6 +38,7 @@ import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.util.CSV;
 import org.onap.aaf.cadi.util.CSV.Visitor;
 import org.onap.aaf.cadi.util.CSV.Writer;
+import org.onap.aaf.cadi.util.Holder;
 
 public class JU_CSV {
 
@@ -110,7 +109,8 @@ public class JU_CSV {
             public void visit(List<String> row) {
                 for(String s: row) {
 //                    System.out.println(hi.value + ") " + s);
-                    Assert.assertEquals(expected.get(hi.value++),s);
+                    Assert.assertEquals(expected.get(hi.get()),s);
+                    hi.set(hi.get()+1); // increment
                 }
             }
         });
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java
new file mode 100644
index 00000000..d1fa94b8
--- /dev/null
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * ============LICENSE_START====================================================
+ * * org.onap.aaf
+ * * ===========================================================================
+ * * Copyright © 2017 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.cadi.util.test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+import org.onap.aaf.cadi.util.Holder;
+
+public class JU_Holder {
+
+    @Test
+    public void test() {
+        String str1 = "a string";
+        String str2 = "another string";
+        Holder<String> holder = new Holder<String>(str1);
+        assertThat(holder.get(), is(str1));
+        assertThat(holder.toString(), is(str1));
+
+        holder.set(str2);
+        assertThat(holder.get(), is(str2));
+        assertThat(holder.toString(), is(str2));
+    }
+
+}