Author: [email protected]
Date: Fri May 20 09:13:35 2011
New Revision: 1143
Log:
[AMDATUOPENSOCIAL-40] Implemented dashboard integration test
Removed:
trunk/amdatu-opensocial/test-integration/tests/src/test/java/org/amdatu/opensocial/test/integration/tests/OpenSocialTest.java
Modified:
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
trunk/amdatu-opensocial/test-integration/pom.xml
trunk/amdatu-opensocial/test-integration/tests/pom.xml
Modified:
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
==============================================================================
---
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
(original)
+++
trunk/amdatu-opensocial/test-integration/base/src/main/java/org/amdatu/opensocial/test/integration/base/OpenSocialFixture.java
Fri May 20 09:13:35 2011
@@ -32,38 +32,45 @@
public static final String PORTNR = "8080";
public Option provision() {
+ System.setProperty("jaxp.debug", "true");
+ //System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
"org.apache.crimson.jaxp.DocumentBuilderFactoryImpl");
return composite(
-
systemProperty("org.osgi.framework.system.packages.extra").value("sun.misc"),
-
+ systemProperty("jaxp.debug").value("true"),
+ // Add sun.misc and com.sun.management to system packages
+
//systemProperty("javax.xml.parsers.DocumentBuilderFactory").value("org.apache.crimson.jaxp.DocumentBuilderFactoryImpl"),
+
org.ops4j.pax.exam.CoreOptions.provision(
// Wrap libraries we depend on as OSGi bundles and provision
those
wrappedBundle(mavenBundle().groupId("commons-httpclient").artifactId("commons-httpclient").versionAsInProject()),
wrappedBundle(mavenBundle().groupId("commons-codec").artifactId("commons-codec").versionAsInProject()),
wrappedBundle(mavenBundle().groupId("commons-logging").artifactId("commons-logging").versionAsInProject()),
wrappedBundle(mavenBundle().groupId("org.json").artifactId("json").versionAsInProject()),
-
+
// The following 2 artifacts are necessary for default tenant
resolving
mavenBundle().groupId("org.amdatu.web").artifactId("org.amdatu.web.tenantresolver.hostname").versionAsInProject(),
mavenBundle().groupId("org.amdatu.web").artifactId("org.amdatu.web.tenantresolver.parameter").versionAsInProject(),
-
+
// Provision Amdatu OpenSocial bundles
+
mavenBundle().groupId("org.amdatu.opensocial").artifactId("org.amdatu.opensocial.test.integration.base").versionAsInProject(),
mavenBundle().groupId("org.amdatu.auth").artifactId("org.amdatu.auth.oauth.api").versionAsInProject(),
mavenBundle().groupId("org.amdatu.auth").artifactId("org.amdatu.auth.tokenprovider").versionAsInProject(),
mavenBundle().groupId("org.amdatu.opensocial").artifactId("org.amdatu.opensocial.dashboard").versionAsInProject(),
mavenBundle().groupId("org.amdatu.opensocial").artifactId("org.amdatu.opensocial.gadgetmanagement").versionAsInProject(),
-
mavenBundle().groupId("org.amdatu.opensocial").artifactId("org.amdatu.opensocial.shindig").versionAsInProject()
- )
- );
+
mavenBundle().groupId("org.amdatu.opensocial").artifactId("org.amdatu.opensocial.shindig").versionAsInProject(),
+
+
mavenBundle().groupId("org.ops4j.pax.swissbox").artifactId("pax-swissbox-core").versionAsInProject(),
+
mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").versionAsInProject()));
}
public void configureDefaults(TestContext testContext) throws Exception {
configureShindig(testContext);
+ configureHttpService(testContext);
}
public void configureShindig(TestContext testContext) throws Exception {
testContext.updateConfig(ShindigService.SHINDIG_CONFIG_PID,
getShindigCfg());
}
-
+
private Properties getShindigCfg() {
Properties properties = new Properties();
properties.put("shindig.features.default",
"res://features/features.txt");
@@ -121,4 +128,18 @@
properties.put("shindig.proxy.remapInternalServerError", "false");
return properties;
}
+
+ public void configureHttpService(TestContext testContext) throws Exception
{
+ testContext.updateConfig("org.apache.felix.http", getHttpServiceCfg());
+ }
+
+ private Properties getHttpServiceCfg() {
+ Properties properties = new Properties();
+ properties.put("org.osgi.service.http.hostname", HOSTNAME);
+ properties.put("org.osgi.service.http.port", PORTNR);
+ properties.put("org.osgi.service.http.port.secure", "8090");
+ properties.put("org.apache.felix.http.debug", "true");
+ properties.put("org.apache.felix.log.storeDebug", "true");
+ return properties;
+ }
}
Modified: trunk/amdatu-opensocial/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-integration/pom.xml (original)
+++ trunk/amdatu-opensocial/test-integration/pom.xml Fri May 20 09:13:35 2011
@@ -62,6 +62,13 @@
<scope>compile</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.test.integration.base</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>bundle</type>
+ </dependency>
<!--
Some dependency scopes are intentionally set to compile in this
Modified: trunk/amdatu-opensocial/test-integration/tests/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-integration/tests/pom.xml (original)
+++ trunk/amdatu-opensocial/test-integration/tests/pom.xml Fri May 20
09:13:35 2011
@@ -102,7 +102,7 @@
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.test.integration.base</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
@@ -276,6 +276,7 @@
</goals>
<configuration>
<systemPropertyVariables>
+
<org.osgi.framework.system.packages.extra>sun.misc,com.sun.management</org.osgi.framework.system.packages.extra>
</systemPropertyVariables>
<skip>false</skip>
</configuration>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
