Author: ivol37 at gmail.com
Date: Fri Feb 11 15:59:35 2011
New Revision: 778
Log:
[AMDATU-300] Fixed by removing the test tenant after creating it in the FS
tenant storage provider test. Also added assert to OAuthTwoLeggedTest to verify
that there is only 1 tenant available when the test starts, as the test classes
used are not tenant aware.
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/OAuthTestBase.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/FSTenantStorageProviderServiceTest.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/OAuthTwoLeggedTest.java
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/OAuthTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/OAuthTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/OAuthTestBase.java
Fri Feb 11 15:59:35 2011
@@ -34,6 +34,7 @@
import org.amdatu.authentication.oauth.server.OAuthRequestTokenServlet;
import org.amdatu.authentication.oauth.server.OAuthTokenProvider;
import org.amdatu.authorization.login.service.LoginService;
+import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.test.integration.mock.OAuthProtectedTestServlet;
import org.amdatu.test.integration.util.Login;
import org.apache.commons.httpclient.HeaderElement;
@@ -57,6 +58,7 @@
protected volatile OAuthTokenProvider m_tokenProvider;
protected volatile OAuthServiceConsumerRegistry m_consumerRegistry;
protected volatile UserAdmin m_userAdmin;
+ protected volatile TenantManagementService m_tenantService;
private HeaderElement m_cookieHeaderElement;
@@ -86,24 +88,25 @@
servletProperties.put("alias",
OAuthProtectedTestServlet.SERVLET_ALIAS);
servletProperties.put("contextId",
OAuthProtectedTestServlet.SERVLET_ALIAS);
Component servletComponent = manager.createComponent()
- .setImplementation(m_testServlet)
- .setInterface(new String[] { Servlet.class.getName() },
servletProperties)
-
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(OAuthServiceConsumerRegistry.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(OAuthTokenProvider.class).setRequired(true));
+ .setImplementation(m_testServlet)
+ .setInterface(new String[] { Servlet.class.getName() },
servletProperties)
+
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(OAuthServiceConsumerRegistry.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(OAuthTokenProvider.class).setRequired(true));
Component testComponent = manager.createComponent()
- .setImplementation(this)
-
.add(manager.createServiceDependency().setService(OAuthRequestTokenServlet.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(OAuthTokenProvider.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(OAuthServiceProvider.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(OAuthServiceConsumerRegistry.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(HttpService.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(UserAdmin.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(LoginService.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(StorageProvider.class).setRequired(true))
-
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true));
+ .setImplementation(this)
+
.add(manager.createServiceDependency().setService(OAuthRequestTokenServlet.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(OAuthTokenProvider.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(OAuthServiceProvider.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(OAuthServiceConsumerRegistry.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(HttpService.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(UserAdmin.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(LoginService.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(StorageProvider.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(TenantManagementService.class).setRequired(true))
+
.add(manager.createServiceDependency().setService(LogService.class).setRequired(true));
return new Component[] { servletComponent, testComponent };
}
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/FSTenantStorageProviderServiceTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/FSTenantStorageProviderServiceTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/FSTenantStorageProviderServiceTest.java
Fri Feb 11 15:59:35 2011
@@ -108,5 +108,8 @@
Assert.assertNotNull("Tenant was not persisted", te2);
Assert.assertNotNull("Tenant properties not persisted",
te2.getProperties());
Assert.assertEquals("Tenant property was not set", "hot choco",
te2.getProperties().get("favorite.drink"));
+
+ // Remove tenant
+ m_tenantManagementService.deleteTenant(te1);
}
}
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/OAuthTwoLeggedTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/OAuthTwoLeggedTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/OAuthTwoLeggedTest.java
Fri Feb 11 15:59:35 2011
@@ -16,10 +16,10 @@
*/
package org.amdatu.test.integration.tests;
+import static org.amdatu.test.integration.base.ConfigProvider.TEST_USERNAME;
import static
org.amdatu.test.integration.mock.OAuthProtectedTestServlet.OAUTH_TYPE_PARAM;
import static
org.amdatu.test.integration.mock.OAuthProtectedTestServlet.OAUTH_TYPE_TWO_LEGGED;
import static
org.amdatu.test.integration.mock.OAuthProtectedTestServlet.SERVLET_ALIAS;
-import static org.amdatu.test.integration.base.ConfigProvider.*;
import net.oauth.OAuthAccessor;
import net.oauth.OAuthMessage;
@@ -30,7 +30,6 @@
import org.amdatu.test.integration.base.OAuthTestBase;
import org.amdatu.test.integration.mock.OAuthTestConsumer;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -39,9 +38,12 @@
@RunWith(JUnit4TestRunner.class)
public class OAuthTwoLeggedTest extends OAuthTestBase {
- @Ignore
@Test
public void testThreeLeggedOAuth() throws Exception {
+ // Since this test is not tenant aware, verify that there is only 1
tenant
+ Assert.assertTrue(m_tenantService.getTenants().size() + " tenants
exist, this test has not been written to cope with deal with multiple tenants",
+ m_tenantService.getTenants().size() == 1);
+
// First wait for the oAuth servlets to become available
waitForOAuthServlets();
