You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/11/08 09:33:29 UTC
svn commit: r1768648 - in
/sling/trunk/bundles/extensions/repoinit/parser/src:
main/java/org/apache/sling/repoinit/parser/operations/
test/java/org/apache/sling/repoinit/parser/test/ test/resources/testcases/
Author: bdelacretaz
Date: Tue Nov 8 09:33:29 2016
New Revision: 1768648
URL: http://svn.apache.org/viewvc?rev=1768648&view=rev
Log:
SLING-6219 - clarify tests about parsing of the password encoding
Modified:
sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
sling/trunk/bundles/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java
sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60-output.txt
sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60.txt
sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-99-output.txt
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java?rev=1768648&r1=1768647&r2=1768648&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java Tue Nov 8 09:33:29 2016
@@ -58,4 +58,8 @@ public class CreateUser extends Operatio
public String getPassword() {
return password;
}
+
+ public String getPasswordEncoding() {
+ return passwordEncoding;
+ }
}
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java?rev=1768648&r1=1768647&r2=1768648&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/OperationToStringVisitor.java Tue Nov 8 09:33:29 2016
@@ -55,7 +55,15 @@ class OperationToStringVisitor implement
@Override
public void visitCreateUser(CreateUser u) {
- out.println(u.toString());
+ final StringBuilder sb = new StringBuilder();
+ sb.append(u.toString());
+ if(u.getPassword() != null) {
+ sb.append(", password=").append(u.getPassword());
+ }
+ if(u.getPasswordEncoding() != null) {
+ sb.append(", passwordEncoding=").append(u.getPasswordEncoding());
+ }
+ out.println(sb.toString());
}
@Override
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60-output.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60-output.txt?rev=1768648&r1=1768647&r2=1768648&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60-output.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60-output.txt Tue Nov 8 09:33:29 2016
@@ -1,6 +1,6 @@
DeleteUser userB
CreateUser userB
-CreateUser userC (with password)
-CreateUser userD (with encoded password)
-CreateUser userE (with encoded password)
-CreateUser one_with-more-chars.ok:/123456 (with encoded password)
\ No newline at end of file
+CreateUser userC (with password), password=some_password
+CreateUser userD (with encoded password), password=dc460da4ad72c, passwordEncoding=SHA-256
+CreateUser userE (with encoded password), password=afdgwdsdf, passwordEncoding=someEncoding
+CreateUser one_with-more-chars.ok:/123456 (with encoded password), password=pw-with.ok-:/13456, passwordEncoding=encoding_with.ok-:/12345
\ No newline at end of file
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60.txt?rev=1768648&r1=1768647&r2=1768648&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-60.txt Tue Nov 8 09:33:29 2016
@@ -4,7 +4,7 @@ delete user userB
create user userB
create user userC with password some_password
-create user userD with password {SHA-256}dc460da4ad72c482231e28e688e01f2778a88ce31a08826899d54ef7183998b5
+create user userD with password {SHA-256}dc460da4ad72c
create user userE with password {someEncoding} afdgwdsdf
Modified: sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-99-output.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-99-output.txt?rev=1768648&r1=1768647&r2=1768648&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-99-output.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/parser/src/test/resources/testcases/test-99-output.txt Tue Nov 8 09:33:29 2016
@@ -23,6 +23,6 @@ RegisterNodetypes:
[slingevent:Event] > nt:unstructured, nt:hierarchyNode
- slingevent:topic (string)
- slingevent:properties (binary)
-CreateUser userE (with encoded password)
-CreateUser one_with-more-chars.ok:/123456 (with encoded password)
+CreateUser userE (with encoded password), password=afdgwdsdf, passwordEncoding=someEncoding
+CreateUser one_with-more-chars.ok:/123456 (with encoded password), password=pw-with.ok-:/13456, passwordEncoding=encoding_with.ok-:/12345
CreateServiceUser the-last-one
\ No newline at end of file