Author: mes
Date: 2010-11-19 12:30:38 -0800 (Fri, 19 Nov 2010)
New Revision: 22935
Modified:
core3/model-impl/trunk/it/pom.xml
core3/model-impl/trunk/it/src/test/java/org/cytoscape/model/ServiceConfigurationTest.java
core3/model-impl/trunk/pom.xml
Log:
integration tests now configured through maven
Modified: core3/model-impl/trunk/it/pom.xml
===================================================================
--- core3/model-impl/trunk/it/pom.xml 2010-11-19 20:10:48 UTC (rev 22934)
+++ core3/model-impl/trunk/it/pom.xml 2010-11-19 20:30:38 UTC (rev 22935)
@@ -29,19 +29,17 @@
<execution>
<id>generate-config</id>
<goals>
-
<goal>generate-depends-file</goal>
+
<goal>generate-config</goal>
</goals>
</execution>
</executions>
- <!--
<configuration>
<options>
<platform>felix</platform>
<profiles>spring.dm</profiles>
</options>
</configuration>
- -->
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -61,37 +59,34 @@
<groupId>org.cytoscape</groupId>
<artifactId>model-impl</artifactId>
<version>${version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>event-impl</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>integration-test-support</artifactId>
<version>3.0.0-alpha3-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
+ <version>${pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
+ <version>${pax.exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
+ <version>${pax.exam.version}</version>
</dependency>
</dependencies>
</project>
Modified:
core3/model-impl/trunk/it/src/test/java/org/cytoscape/model/ServiceConfigurationTest.java
===================================================================
---
core3/model-impl/trunk/it/src/test/java/org/cytoscape/model/ServiceConfigurationTest.java
2010-11-19 20:10:48 UTC (rev 22934)
+++
core3/model-impl/trunk/it/src/test/java/org/cytoscape/model/ServiceConfigurationTest.java
2010-11-19 20:30:38 UTC (rev 22935)
@@ -1,41 +1,18 @@
package org.cytoscape.model;
-import static org.ops4j.pax.exam.CoreOptions.*;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.Before;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.integration.ServiceTestSupport;
-//@RunWith(MavenConfiguredJUnit4TestRunner.class)
-...@runwith(JUnit4TestRunner.class)
+...@runwith(MavenConfiguredJUnit4TestRunner.class)
public class ServiceConfigurationTest extends ServiceTestSupport {
- @Configuration
- public static Option[] configuration() {
- return options(felix(),
- profile("spring.dm"),
- provision(
-
mavenBundle().groupId("org.cytoscape").artifactId("model-impl").versionAsInProject(),
-
mavenBundle().groupId("org.cytoscape").artifactId("model-api").versionAsInProject(),
-
mavenBundle().groupId("org.cytoscape").artifactId("event-api").versionAsInProject(),
-
mavenBundle().groupId("org.cytoscape").artifactId("event-impl").versionAsInProject(),
-
mavenBundle().groupId("org.cytoscape").artifactId("integration-test-support").versionAsInProject()
- ));
- }
-
@Test
public void testExpectedServices() {
checkService(CyNetworkFactory.class);
Modified: core3/model-impl/trunk/pom.xml
===================================================================
--- core3/model-impl/trunk/pom.xml 2010-11-19 20:10:48 UTC (rev 22934)
+++ core3/model-impl/trunk/pom.xml 2010-11-19 20:30:38 UTC (rev 22935)
@@ -58,6 +58,7 @@
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
@@ -70,6 +71,12 @@
<groupId>org.cytoscape</groupId>
<artifactId>event-api</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>event-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
