Author: [email protected]
Date: Thu Apr 14 15:20:56 2011
New Revision: 968
Log:
[AMDATUCASSANDRA-7] Integration test refactoring
Modified:
trunk/amdatu-cassandra/test-integration/pom.xml
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/ConfigProvider.java
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
Modified: trunk/amdatu-cassandra/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/pom.xml Thu Apr 14 15:20:56 2011
@@ -19,10 +19,7 @@
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
- <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
<pax.swissbox.version>1.3.0</pax.swissbox.version>
-
<org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version>
-
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
<org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
</properties>
@@ -72,20 +69,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenantuseradmindecorator</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>application</artifactId>
<version>${project.version}</version>
@@ -114,13 +97,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>useradminstore-fs</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.useradmin</groupId>
<artifactId>pax-useradmin-service</artifactId>
<version>${pax.useradmin.version}</version>
@@ -161,24 +137,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-core</artifactId>
<version>${pax.swissbox.version}</version>
@@ -190,12 +148,6 @@
<version>1.2.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified:
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/ConfigProvider.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/ConfigProvider.java
(original)
+++
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/ConfigProvider.java
Thu Apr 14 15:20:56 2011
@@ -23,7 +23,6 @@
import org.amdatu.cassandra.application.CassandraConfigurationService;
import org.amdatu.core.config.templates.ConfigTemplateManager;
-import org.amdatu.core.tenant.TenantManagementService;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -39,15 +38,6 @@
properties.put("console.mininum.loglevel", "DEBUG");
config.update(properties);
}
-
- public void addTenantConfig(ConfigurationAdmin configAdmin) throws
IOException {
- Configuration config =
configAdmin.getConfiguration(TenantManagementService.PID, null);
- Properties properties = new Properties();
- properties.put("tenant1.id", "Default");
- properties.put("tenant1.name", "Default tenant");
- properties.put("tenant1.properties.hostname", "localhost");
- config.update(properties);
- }
public void addCassandraConfig(ConfigurationAdmin configAdmin) throws
IOException {
Configuration config =
configAdmin.getConfiguration(CassandraConfigurationService.PID, null);
Modified:
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
Thu Apr 14 15:20:56 2011
@@ -325,10 +325,6 @@
return
mavenBundle().groupId("org.amdatu.core").artifactId("loghandler").version("0.2.0-SNAPSHOT");
}
- protected static MavenArtifactProvisionOption amdatuHttpContext() {
- return
mavenBundle().groupId("org.amdatu.web").artifactId("httpcontext").version("0.2.0-SNAPSHOT");
- }
-
protected static MavenArtifactProvisionOption paxUserAdmin() {
return
mavenBundle().groupId("org.ops4j.pax.useradmin").artifactId("pax-useradmin-service").versionAsInProject();
}
@@ -361,18 +357,6 @@
return
mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject();
}
- protected static WrappedUrlProvisionOption commonsLogging() {
- return
wrappedBundle(mavenBundle().groupId("commons-logging").artifactId("commons-logging"));
- }
-
- protected static WrappedUrlProvisionOption commonsCodec() {
- return
wrappedBundle(mavenBundle().groupId("commons-codec").artifactId("commons-codec"));
- }
-
- protected static WrappedUrlProvisionOption json() {
- return
wrappedBundle(mavenBundle().groupId("org.json").artifactId("json").versionAsInProject());
- }
-
protected static WrappedUrlProvisionOption javaxServlet() {
// We need to create a bundle holding the 2.3 servlet API (required by
SLF4J used by Cassandra) if the http service
// is not deployed. Since the org.osgi.compendium_4 and other bundles
include javax.servlet with explicit version
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
