Author: enorman
Date: Sun Aug 22 16:24:05 2010
New Revision: 987926
URL: http://svn.apache.org/viewvc?rev=987926&view=rev
Log:
randomize ids for test users and groups to reduce the risk of collisions
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractAuthenticatedTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateGroupTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateUserTest.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractAuthenticatedTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractAuthenticatedTest.java?rev=987926&r1=987925&r2=987926&view=diff
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractAuthenticatedTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractAuthenticatedTest.java
Sun Aug 22 16:24:05 2010
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
import javax.servlet.http.HttpServletResponse;
@@ -154,12 +155,12 @@ public abstract class AbstractAuthentica
}
- protected static int counter = 1;
+ private static Random random = new Random(System.currentTimeMillis());
protected String createTestUser() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- String testUserId = "testUser" + (counter++);
+ String testUserId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testUserId));
postParams.add(new NameValuePair("pwd", "testPwd"));
@@ -173,7 +174,7 @@ public abstract class AbstractAuthentica
protected String createTestGroup() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/group.create.html";
- String testGroupId = "testGroup" + (counter++);
+ String testGroupId = "testGroup" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testGroupId));
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateGroupTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateGroupTest.java?rev=987926&r1=987925&r2=987926&view=diff
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateGroupTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateGroupTest.java
Sun Aug 22 16:24:05 2010
@@ -19,6 +19,7 @@ package org.apache.sling.launchpad.webap
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
import javax.servlet.http.HttpServletResponse;
@@ -32,6 +33,7 @@ import org.apache.sling.commons.json.JSO
* Tests for the 'createGroup' Sling Post Operation
*/
public class CreateGroupTest extends AbstractUserManagerTest {
+ private static Random random = new Random(System.currentTimeMillis());
String testGroupId = null;
@@ -50,7 +52,7 @@ public class CreateGroupTest extends Abs
public void testCreateGroup() throws IOException, JSONException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/group.create.html";
- testGroupId = "testGroup" + (counter++);
+ testGroupId = "testGroup" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testGroupId));
postParams.add(new NameValuePair("marker", testGroupId));
@@ -75,7 +77,7 @@ public class CreateGroupTest extends Abs
public void testCreateGroupAlreadyExists() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/group.create.html";
- testGroupId = "testGroup" + (counter++);
+ testGroupId = "testGroup" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testGroupId));
assertAuthenticatedAdminPostStatus(postUrl,
HttpServletResponse.SC_OK, postParams, null);
@@ -87,7 +89,7 @@ public class CreateGroupTest extends Abs
public void testCreateGroupWithExtraProperties() throws IOException,
JSONException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/group.create.html";
- testGroupId = "testGroup" + (counter++);
+ testGroupId = "testGroup" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testGroupId));
postParams.add(new NameValuePair("marker", testGroupId));
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateUserTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateUserTest.java?rev=987926&r1=987925&r2=987926&view=diff
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateUserTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/CreateUserTest.java
Sun Aug 22 16:24:05 2010
@@ -19,6 +19,7 @@ package org.apache.sling.launchpad.webap
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
import javax.servlet.http.HttpServletResponse;
@@ -32,6 +33,7 @@ import org.apache.sling.commons.json.JSO
* Tests for the 'createUser' Sling Post Operation
*/
public class CreateUserTest extends AbstractUserManagerTest {
+ private static Random random = new Random(System.currentTimeMillis());
String testUserId = null;
@@ -57,7 +59,7 @@ public class CreateUserTest extends Abst
public void testCreateUser() throws IOException, JSONException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- testUserId = "testUser" + (counter++);
+ testUserId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testUserId));
postParams.add(new NameValuePair("marker", testUserId));
@@ -88,7 +90,7 @@ public class CreateUserTest extends Abst
public void testCreateUserMissingPwd() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- String userId = "testUser" + (counter++);
+ String userId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", userId));
Credentials creds = new UsernamePasswordCredentials("admin",
"admin");
@@ -98,7 +100,7 @@ public class CreateUserTest extends Abst
public void testCreateUserWrongConfirmPwd() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- String userId = "testUser" + (counter++);
+ String userId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", userId));
postParams.add(new NameValuePair("pwd", "testPwd"));
@@ -110,7 +112,7 @@ public class CreateUserTest extends Abst
public void testCreateUserUserAlreadyExists() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- testUserId = "testUser" + (counter++);
+ testUserId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testUserId));
postParams.add(new NameValuePair("pwd", "testPwd"));
@@ -135,7 +137,7 @@ public class CreateUserTest extends Abst
public void testCreateUserWithExtraProperties() throws IOException,
JSONException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- testUserId = "testUser" + (counter++);
+ testUserId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testUserId));
postParams.add(new NameValuePair("marker", testUserId));
@@ -166,7 +168,7 @@ public class CreateUserTest extends Abst
public void testAnonymousSelfRegistrationDisabled() throws IOException {
String postUrl = HTTP_BASE_URL +
"/system/userManager/user.create.html";
- String userId = "testUser" + (counter++);
+ String userId = "testUser" + random.nextInt();
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", userId));
postParams.add(new NameValuePair("pwd", "testPwd"));
