svn commit: r1733895 - in /sling/trunk/launchpad/base: pom.xml src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java

[as...@apache.org]

Author: asanso
Date: Mon Mar  7 10:32:35 2016
New Revision: 1733895

URL: http://svn.apache.org/viewvc?rev=1733895&view=rev
Log:
SLING-5587 - Improve ControlListener#generateKey

Modified:
    sling/trunk/launchpad/base/pom.xml
    sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java

Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1733895&r1=1733894&r2=1733895&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Mar  7 10:32:35 2016
@@ -307,6 +307,12 @@
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit-addons</groupId>
+            <artifactId>junit-addons</artifactId>
+            <version>1.4</version>
+            <scope>test</scope>
+        </dependency> 
     </dependencies>
 </project>
 

Modified: sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java?rev=1733895&r1=1733894&r2=1733895&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java (original)
+++ sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java Mon Mar  7 10:32:35 2016
@@ -25,10 +25,14 @@ import java.io.PrintWriter;
 import java.net.ServerSocket;
 import java.util.HashMap;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.sling.launchpad.base.shared.SharedConstants;
+import org.junit.Assert;
 
 import junit.framework.TestCase;
+import junitx.util.PrivateAccessor;
 
 public class ControlListenerTest extends TestCase {
 
@@ -334,6 +338,22 @@ public class ControlListenerTest extends
 
         TestCase.assertTrue(ctlFile1.exists());
     }
+    
+    public void test_generateKey() throws Throwable {
+        Pattern pattern = Pattern.compile("([a-zA-Z0-9-_=]+)");
+        MyMain main = new MyMain(SLING1);
+        ControlListener cl = new ControlListener(main, null);
+        
+        String secretkey = (String) PrivateAccessor.invoke(cl, "generateKey", new Class[] {}, new Object[] {});
+        Assert.assertEquals(32, secretkey.length());
+        System.out.println(secretkey);
+        Matcher matcher = pattern.matcher(secretkey);
+        if (!matcher.matches()) {
+            Assert.fail();
+        }
+    }
+    
+    //-------------------- private section -----------------------------
 
     private int getPort() {
         ServerSocket s = null;