X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Futil%2Ftest%2FJU_CSV.java;h=fa62fe4ea92d7c171019b4675d1d1b08b84b74e0;hb=deb396a3d53a84b2eb5a46d40122b4902d72c601;hp=9df6de7b798c2c94c8c92c0a3dad3d99732c37c3;hpb=59ffb7d529245c3bd0233dbf6cb0ae9fe9ccb856;p=aaf%2Fauthz.git

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 9df6de7b..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
@@ -7,9 +7,9 @@
  * 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.
@@ -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,86 +38,88 @@ 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 {
 
-	private String filename;
-	private File file;
-	private static ArrayList<Object> expected;
-
-	@Before
-	public void start() {
-		filename = "Sample.csv";
-		file = new File(filename);
-	}
-	
-	@After
-	public void end() {
-		if(file!=null) {
-			file.delete();
-		}
-	}
-
-	@BeforeClass
-	public static void before() {
-		expected = new ArrayList<>();
-	}
-	
-	@Test
-	public void test() throws IOException, CadiException {
-		Access access = new PropAccess();
-		CSV csv = new CSV(access,file);
-		// Can't visit for file that doesn't exist
-		try {
-			csv.visit(new Visitor() {
-				@Override
-				public void visit(List<String> row) {
-				}});
-		} catch(IOException e) {
-			Assert.assertTrue("CSV correctly created exception",true);
-		}
-		
-		Writer writer = csv.writer();
-		try {
-			writer.row(add("\"hello\""));
-			writer.comment("Ignore Comments");
-			writer.row(add("dXNlcjpwYXNzd29yZA=="),add("dXNlckBzb21ldGhpbmcub3JnOm90aGVyUGFzc3dvcmQ="));
-			writer.row(); // no output
-			writer.row(add("There is, but one thing to say"), add(" and that is"), add("\"All the best\""));
-		} finally {
-			writer.close();
-		}
-		
-		PrintStream garbage = new PrintStream(new FileOutputStream(file, true));
-		try {
-			garbage.println("# Ignore empty spaces, etc");
-			garbage.println("   ");
-			garbage.println("# Ignore blank lines");
-			garbage.println();
-		} finally {
-			garbage.close();
-		}
-
-	
-	//////////// 
-	// Tests
-	////////////
-		final Holder<Integer> hi = new Holder<>(0);
-		csv.visit(new CSV.Visitor() {
-			@Override
-			public void visit(List<String> row) {
-				for(String s: row) {
-//					System.out.println(hi.value + ") " + s);
-					Assert.assertEquals(expected.get(hi.value++),s);
-				}
-			}
-		});
-
-	}
-
-	private String add(String s) {
-		expected.add(s);
-		return s;
-	}
+    private String filename;
+    private File file;
+    private static ArrayList<Object> expected;
+
+    @Before
+    public void start() {
+        filename = "Sample.csv";
+        file = new File(filename);
+    }
+
+    @After
+    public void end() {
+        if(file!=null) {
+            file.delete();
+        }
+    }
+
+    @BeforeClass
+    public static void before() {
+        expected = new ArrayList<>();
+    }
+
+    @Test
+    public void test() throws IOException, CadiException {
+        Access access = new PropAccess();
+        CSV csv = new CSV(access,file);
+        // Can't visit for file that doesn't exist
+        try {
+            csv.visit(new Visitor() {
+                @Override
+                public void visit(List<String> row) {
+                }});
+        } catch(IOException e) {
+            Assert.assertTrue("CSV correctly created exception",true);
+        }
+
+        Writer writer = csv.writer();
+        try {
+            writer.row(add("\"hello\""));
+            writer.comment("Ignore Comments");
+            writer.row(add("dXNlcjpwYXNzd29yZA=="),add("dXNlckBzb21ldGhpbmcub3JnOm90aGVyUGFzc3dvcmQ="));
+            writer.row(); // no output
+            writer.row(add("There is, but one thing to say"), add(" and that is"), add("\"All the best\""));
+        } finally {
+            writer.close();
+        }
+
+        PrintStream garbage = new PrintStream(new FileOutputStream(file, true));
+        try {
+            garbage.println("# Ignore empty spaces, etc");
+            garbage.println("   ");
+            garbage.println("# Ignore blank lines");
+            garbage.println();
+        } finally {
+            garbage.close();
+        }
+
+
+    ////////////
+    // Tests
+    ////////////
+        final Holder<Integer> hi = new Holder<>(0);
+        csv.visit(new CSV.Visitor() {
+            @Override
+            public void visit(List<String> row) {
+                for(String s: row) {
+//                    System.out.println(hi.value + ") " + s);
+                    Assert.assertEquals(expected.get(hi.get()),s);
+                    hi.set(hi.get()+1); // increment
+                }
+            }
+        });
+
+    }
+
+    private String add(String s) {
+        expected.add(s);
+        return s;
+    }
 
 }