X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfig%2Ftest%2FJU_UsersDump.java;h=c8067defa8c6dde4ba0c30982579baa053c754b9;hb=HEAD;hp=63b8cf2d1a3e2e57fa9b349ac9aebf91aac218e7;hpb=4fec2a6ea44a28d676dd70d25228f615c4dd47ce;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_UsersDump.java b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_UsersDump.java
index 63b8cf2d..c8067def 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_UsersDump.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_UsersDump.java
@@ -21,9 +21,13 @@
 
 package org.onap.aaf.cadi.config.test;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import org.junit.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -39,100 +43,103 @@ import org.onap.aaf.cadi.util.Split;
 
 public class JU_UsersDump {
 
-	private ByteArrayOutputStream outStream;
-	private ByteArrayOutputStream stdoutSuppressor;
-
-	private static final String expected = "<?xml version='1.0' encoding='utf-8'?>\n" +
-		"<!--\n" +
-		"    Code Generated Tomcat Users and Roles from AT&T LUR on ...\n" +
-		"-->\n" +
-		"<tomcat-users>\n" +
-		"  <role rolename=\"suser\"/>\n" +
-		"  <role rolename=\"admin\"/>\n" +
-		"  <role rolename=\"groupB\"/>\n" +
-		"  <role rolename=\"groupA\"/>\n" +
-		"  \n" +
-		"  <user username=\"yourname@none\" roles=\"admin\"/>\n" +
-		"  <user username=\"m1234@none\" roles=\"suser\"/>\n" +
-		"  <user username=\"hisname@none\" roles=\"suser\"/>\n" +
-		"  <user username=\"hername@none\" roles=\"suser\"/>\n" +
-		"  <user username=\"myname\" roles=\"groupB,groupA\"/>\n" +
-		"  <user username=\"myname@none\" roles=\"admin\"/>\n" +
-		"</tomcat-users>\n";
-
-	private final static String groups = "myname:groupA,groupB";
-	private final static String names = "admin:myname,yourname;suser:hisname,hername,m1234";
-
-	private AbsUserCache<LocalPermission> lur;
-		
-	@Before
-	public void setup() throws IOException {
-		outStream = new ByteArrayOutputStream();
-		stdoutSuppressor = new ByteArrayOutputStream();
-
-		System.setOut(new PrintStream(stdoutSuppressor));
-
-		lur = new LocalLur(new PropAccess(), groups, names);
-	}
-
-	@After
-	public void tearDown() {
-		System.setOut(System.out);
-	}
-
-	@Test
-	public void writeTest() throws IOException {
-		UsersDump.write(outStream, lur);
-		String[] actualLines = Split.splitTrim('\n', outStream.toString());
-		String[] expectedLines = Split.splitTrim('\n', expected);
-
-		assertThat(actualLines.length, is(expectedLines.length));
-
-		// Check that the output starts with an XML tag
-		assertThat(actualLines[0], is(expectedLines[0]));
-		// Check that lines 2-4 are a comment
-		assertThat(actualLines[1], is(expectedLines[1]));
-		assertThat(actualLines[3], is(expectedLines[3]));
-
-		// Check that the rest of the output matches the expected output
-		for (int i = 4; i < actualLines.length; i++) {
-			assertThat(actualLines[i], is(expectedLines[i]));
-		}
-
-		// Run the test again with outStream as a PrintStream (for coverage)
-		outStream.reset();
-		UsersDump.write(new PrintStream(outStream), lur);
-		actualLines = Split.splitTrim('\n', outStream.toString());
-
-		assertThat(actualLines.length, is(expectedLines.length));
-
-		// Check that the output starts with an XML tag
-		assertThat(actualLines[0], is(expectedLines[0]));
-		// Check that lines 2-4 are a comment
-		assertThat(actualLines[1], is(expectedLines[1]));
-		assertThat(actualLines[3], is(expectedLines[3]));
-
-		// Check that the rest of the output matches the expected output
-		for (int i = 4; i < actualLines.length; i++) {
-			assertThat(actualLines[i], is(expectedLines[i]));
-		}
-	}
-
-	@Test
-	public void updateUsersTest() {
-		String output;
-		File outputFile = new File("src/test/resources/userdump.xml");
-		assertThat(outputFile.exists(), is(false));
-
-		output = UsersDump.updateUsers("src/test/resources/userdump.xml", (LocalLur) lur);
-		assertThat(output, is(nullValue()));
-		assertThat(outputFile.exists(), is(true));
-
-		output = UsersDump.updateUsers("src/test/resources/userdump.xml", (LocalLur) lur);
-		assertThat(output, is(nullValue()));
-		assertThat(outputFile.exists(), is(true));
-
-		outputFile.delete();
-	}
+    private ByteArrayOutputStream outStream;
+    private ByteArrayOutputStream stdoutSuppressor;
+
+    private static final String expected = "<?xml version='1.0' encoding='utf-8'?>\n" +
+        "<!--\n" +
+        "    Code Generated Tomcat Users and Roles from AT&T LUR on ...\n" +
+        "-->\n" +
+        "<tomcat-users>\n" +
+        "  <role rolename=\"suser\"/>\n" +
+        "  <role rolename=\"admin\"/>\n" +
+        "  <role rolename=\"groupB\"/>\n" +
+        "  <role rolename=\"groupA\"/>\n" +
+        "  \n" +
+        "  <user username=\"hisname@people.osaaf.org\" roles=\"suser\"/>\n" +
+        "  <user username=\"yourname@people.osaaf.org\" roles=\"admin\"/>\n" +
+        "  <user username=\"myname@people.osaaf.org\" roles=\"admin\"/>\n" +
+        "  <user username=\"m1234@people.osaaf.org\" roles=\"suser\"/>\n" +
+        "  <user username=\"myname\" roles=\"groupB,groupA\"/>\n" +
+        "  <user username=\"hername@people.osaaf.org\" roles=\"suser\"/>\n" +        
+        "</tomcat-users>\n";
+
+    private final static String groups = "myname:groupA,groupB";
+    private final static String names = "admin:myname,yourname;suser:hisname,hername,m1234";
+
+    private AbsUserCache<LocalPermission> lur;
+
+    @Before
+    public void setup() throws IOException {
+        outStream = new ByteArrayOutputStream();
+        stdoutSuppressor = new ByteArrayOutputStream();
+
+        System.setOut(new PrintStream(stdoutSuppressor));
+
+        lur = new LocalLur(new PropAccess(), groups, names);
+    }
+
+    @After
+    public void tearDown() {
+        System.setOut(System.out);
+    }
+
+    @Test
+    public void writeTest() throws IOException {
+        UsersDump.write(outStream, lur);
+        String[] actualLines = Split.splitTrim('\n', outStream.toString());
+        String[] expectedLines = Split.splitTrim('\n', expected);
+        for (String s : actualLines) {
+            System.out.println(s);
+        }
+
+        assertThat(actualLines.length, is(expectedLines.length));
+
+        // Check that the output starts with an XML tag
+        assertThat(actualLines[0], is(expectedLines[0]));
+        // Check that lines 2-4 are a comment
+        assertThat(actualLines[1], is(expectedLines[1]));
+        assertThat(actualLines[3], is(expectedLines[3]));
+
+        // Check that the rest of the output matches the expected output
+        for (int i = 4; i < actualLines.length; i++) {
+            assertThat(actualLines[i], is(expectedLines[i]));
+        }
+
+        // Run the test again with outStream as a PrintStream (for coverage)
+        outStream.reset();
+        UsersDump.write(new PrintStream(outStream), lur);
+        actualLines = Split.splitTrim('\n', outStream.toString());
+
+        assertThat(actualLines.length, is(expectedLines.length));
+
+        // Check that the output starts with an XML tag
+        assertThat(actualLines[0], is(expectedLines[0]));
+        // Check that lines 2-4 are a comment
+        assertThat(actualLines[1], is(expectedLines[1]));
+        assertThat(actualLines[3], is(expectedLines[3]));
+
+        // Check that the rest of the output matches the expected output
+        for (int i = 4; i < actualLines.length; i++) {
+            assertThat(actualLines[i], is(expectedLines[i]));
+        }
+    }
+
+    @Test
+    public void updateUsersTest() {
+        String output;
+        File outputFile = new File("src/test/resources/userdump.xml");
+        assertThat(outputFile.exists(), is(false));
+
+        output = UsersDump.updateUsers("src/test/resources/userdump.xml", (LocalLur) lur);
+        assertThat(output, is(nullValue()));
+        assertThat(outputFile.exists(), is(true));
+
+        output = UsersDump.updateUsers("src/test/resources/userdump.xml", (LocalLur) lur);
+        assertThat(output, is(nullValue()));
+        assertThat(outputFile.exists(), is(true));
+
+        outputFile.delete();
+    }
 
 }