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=86a12ca022bd53c056cca4ba8b6ff7e2cd4b6f57;hb=83d5e01bcac0bbd8c6386eb5033954001524d91f;hp=63b8cf2d1a3e2e57fa9b349ac9aebf91aac218e7;hpb=77ed20565d7089c3efeaef51afc4e087ea65a192;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..86a12ca0 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 = "\n" +
- "\n" +
- "\n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- "\n";
-
- private final static String groups = "myname:groupA,groupB";
- private final static String names = "admin:myname,yourname;suser:hisname,hername,m1234";
-
- private AbsUserCache 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 = "\n" +
+ "\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "\n";
+
+ private final static String groups = "myname:groupA,groupB";
+ private final static String names = "admin:myname,yourname;suser:hisname,hername,m1234";
+
+ private AbsUserCache 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();
+ }
}