svn commit: r1720316 - in /sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test: OperationToStringVisitor.java ParserTest.java

[bd...@apache.org]

Author: bdelacretaz
Date: Wed Dec 16 10:24:14 2015
New Revision: 1720316

URL: http://svn.apache.org/viewvc?rev=1720316&view=rev
Log:
SLING-5355 - use OperationVisitor in tests

Added:
    sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/OperationToStringVisitor.java
Modified:
    sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java

Added: sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/OperationToStringVisitor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/OperationToStringVisitor.java?rev=1720316&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/OperationToStringVisitor.java (added)
+++ sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/OperationToStringVisitor.java Wed Dec 16 10:24:14 2015
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.sling.acldef.parser.test;
+
+import java.io.PrintWriter;
+
+import org.apache.sling.acldef.parser.operations.CreateServiceUser;
+import org.apache.sling.acldef.parser.operations.DeleteServiceUser;
+import org.apache.sling.acldef.parser.operations.OperationVisitor;
+import org.apache.sling.acldef.parser.operations.SetAcl;
+
+/** OperationVisitor that dumps the operations using
+ *  their toString() methods
+ */
+class OperationToStringVisitor implements OperationVisitor {
+
+    private final PrintWriter output;
+    
+    OperationToStringVisitor(PrintWriter pw) {
+        output = pw;
+    }
+    
+    @Override
+    public void visitCreateServiceUser(CreateServiceUser s) {
+        output.println(s.toString());
+    }
+
+    @Override
+    public void visitDeleteServiceUser(DeleteServiceUser s) {
+        output.println(s.toString());
+    }
+
+    @Override
+    public void visitSetAcl(SetAcl s) {
+        output.println(s.toString());
+    }
+}
\ No newline at end of file

Modified: sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java?rev=1720316&r1=1720315&r2=1720316&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java (original)
+++ sling/trunk/contrib/extensions/acldef-parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java Wed Dec 16 10:24:14 2015
@@ -21,6 +21,8 @@ import static org.junit.Assert.assertEqu
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -29,13 +31,16 @@ import org.apache.commons.io.IOUtils;
 import org.apache.sling.acldef.parser.ACLDefinitions;
 import org.apache.sling.acldef.parser.ParseException;
 import org.apache.sling.acldef.parser.operations.Operation;
+import org.apache.sling.acldef.parser.operations.OperationVisitor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-/** Test the parser using our test-* 
- *  input/expected output files.
+/** Test the parser using our test-* input/expected output files. 
+ *  The code of this class doesn't contain any actual tests, it
+ *  just looks for test-*.txt files, parses them and verifies the
+ *  results according to the test-*-output.txt files.
  */
 @RunWith(Parameterized.class)
 public class ParserTest {
@@ -105,12 +110,14 @@ public class ParserTest {
     public void checkResult() throws ParseException, IOException {
         final String expected = IOUtils.toString(tc.expected, DEFAULT_ENCODING).trim();
         try {
-            final StringBuilder sb = new StringBuilder();
+            final StringWriter sw = new StringWriter();
+            final OperationVisitor v = new OperationToStringVisitor(new PrintWriter(sw)); 
             final List<Operation> result = new ACLDefinitions(tc.input).parse(); 
             for(Operation o : result) {
-                sb.append(o.toString()).append("\n");
+                o.accept(v);
             }
-            assertEquals(expected, sb.toString().trim());
+            sw.flush();
+            assertEquals(expected, sw.toString().trim());
         } finally {
             tc.close();
         }