Author: [email protected]
Date: Tue Jul 19 15:31:13 2011
New Revision: 1221
Log:
[AMDATUAUTH-68] Fixed 401 error in integration test
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthServiceConsumerRegistryTest.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthThreeLeggedTest.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthTestBase.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthServiceConsumerRegistryTest.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthServiceConsumerRegistryTest.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthServiceConsumerRegistryTest.java
Tue Jul 19 15:31:13 2011
@@ -59,8 +59,8 @@
// Log in using an Amdatu account, just after creating it
m_logService.log(LogService.LOG_DEBUG, "*** Step 4: Log in with Amdatu
account '" + AuthTest.TEST_USERNAME
+ "' ***");
- AuthUtils.addTestUser(m_userAdmin);
- login();
+ AuthUtils.addAdminUser(m_userAdmin);
+ loginAsAdministrator();
// And try again, now we should be authorized
statusCode = putConsumer(httpClient, "application/json", consumer,
false);
@@ -75,7 +75,7 @@
Assert.assertTrue("Returned XML consumer is incorrect",
consumer.equals(testConsumer));
- // Now try to add another consumer using the Atom XML format, this
should result in a 304 since the consumer
+ // Now try to add another consumer, this should result in a 304 since
the consumer
// already exists
statusCode = putConsumer(httpClient, "application/json", consumer,
false);
Assert.assertTrue("OAuth Service Consumer registry REST service
returns " + statusCode + " on addConsumer",
@@ -176,7 +176,12 @@
m_logService.log(LogService.LOG_DEBUG, "Deleting consumer for " +
mimeType + ", input=" + consumerKey);
// Execute the method, this should return a 200
- try {
+ try {
+ if (getCookieHeader() != null) {
+ for (String key : getCookieHeader().keySet()) {
+ method.addRequestHeader(key, getCookieHeader().get(key));
+ }
+ }
return httpClient.executeMethod(method);
}
finally {
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthThreeLeggedTest.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthThreeLeggedTest.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthThreeLeggedTest.java
Tue Jul 19 15:31:13 2011
@@ -66,7 +66,7 @@
m_logService.log(LogService.LOG_DEBUG, "*** Step 4: Log in with Amdatu
account '" + AuthTest.TEST_USERNAME
+ "' ***");
AuthUtils.addTestUser(m_userAdmin);
- login();
+ loginAsTestUser();
// Step 5: Authorize the request token for a user we define
m_logService.log(LogService.LOG_DEBUG, "*** Step 5: Authorize the
request token ***");
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
Tue Jul 19 15:31:13 2011
@@ -65,7 +65,7 @@
// Step 3c: Log in using an Amdatu account, but create that account
first
m_logService.log(LogService.LOG_DEBUG, "*** Step 3c: Log in with
Amdatu account '" + TEST_USERNAME + "' ***");
AuthUtils.addTestUser(m_userAdmin);
- login();
+ loginAsTestUser();
// Step 3d: Authorize the request token for a user we define
m_logService.log(LogService.LOG_DEBUG, "*** Step 3d: Authorize the
request token ***");
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthTestBase.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthTestBase.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthTestBase.java
Tue Jul 19 15:31:13 2011
@@ -71,11 +71,7 @@
public void setTenantService(TenantManagementService tenantService) {
m_tenantService = tenantService;
- }
-
- protected void login() throws HttpException, IOException {
- m_cookieHeaderElement.put(m_host,
AuthUtils.login(AuthFixture.HOSTNAME, AuthTest.TEST_USERNAME,
AuthTest.TEST_PASSWORD));
- }
+ }
protected void addCookieHeader(HttpMethod method) {
if (m_cookieHeaderElement.get(m_host) != null) {
@@ -103,6 +99,13 @@
return m_restBaseUrl;
}
+ protected void loginAsTestUser() throws HttpException, IOException {
+ if (m_host == null) {
+ m_host = AuthFixture.HOSTNAME;
+ }
+ m_cookieHeaderElement.put(m_host,
AuthUtils.login(AuthFixture.HOSTNAME, AuthTest.TEST_USERNAME,
AuthTest.TEST_PASSWORD));
+ }
+
protected void loginAsAdministrator() throws HttpException, IOException {
if (m_host == null) {
m_host = AuthFixture.HOSTNAME;
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/util/AuthUtils.java
Tue Jul 19 15:31:13 2011
@@ -86,14 +86,23 @@
}
@SuppressWarnings("unchecked")
+ public static void addAdminUser(UserAdmin userAdmin) {
+ addUser(userAdmin, AuthTest.ADMIN_USERNAME, AuthTest.ADMIN_PASSWORD);
+ }
+
+ @SuppressWarnings("unchecked")
public static void addTestUser(UserAdmin userAdmin) {
- User user = (User) userAdmin.createRole(AuthTest.TEST_USERNAME,
Role.USER);
+ addUser(userAdmin, AuthTest.TEST_USERNAME, AuthTest.TEST_PASSWORD);
+ }
+
+ private static void addUser(UserAdmin userAdmin, String name, String
password) {
+ User user = (User) userAdmin.createRole(name, Role.USER);
// Verify if the user is not null, if it is null it did already exist.
This is the case for
// example when the integration test is executed twice without
removing the work directory n between.
if (user != null) {
- user.getCredentials().put(LoginService.PASSWORD_CREDENTIAL_KEY,
AuthTest.TEST_PASSWORD);
- Assert.assertTrue("Test user '" + AuthTest.TEST_USERNAME + "'
could not be created", userAdmin.getRole(AuthTest.TEST_USERNAME) != null);
+ user.getCredentials().put(LoginService.PASSWORD_CREDENTIAL_KEY,
password);
+ Assert.assertTrue("Test user '" + name + "' could not be created",
userAdmin.getRole(name) != null);
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
