Author: mes
Date: 2010-11-18 17:24:27 -0800 (Thu, 18 Nov 2010)
New Revision: 22919
Added:
core3/viewmodel-impl/trunk/impl/
core3/viewmodel-impl/trunk/impl/osgi.bnd
core3/viewmodel-impl/trunk/impl/pom.xml
core3/viewmodel-impl/trunk/impl/src/
core3/viewmodel-impl/trunk/it/
core3/viewmodel-impl/trunk/it/pom.xml
core3/viewmodel-impl/trunk/it/src/
core3/viewmodel-impl/trunk/it/src/test/
core3/viewmodel-impl/trunk/it/src/test/java/
core3/viewmodel-impl/trunk/it/src/test/java/org/
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/view/
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/view/model/
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/view/model/ServiceConfigurationTest.java
Removed:
core3/viewmodel-impl/trunk/impl/src/integration/
core3/viewmodel-impl/trunk/osgi.bnd
core3/viewmodel-impl/trunk/pom.xml
core3/viewmodel-impl/trunk/src/
Log:
refactored integration testing
Copied: core3/viewmodel-impl/trunk/impl/osgi.bnd (from rev 22857,
core3/viewmodel-impl/trunk/osgi.bnd)
===================================================================
--- core3/viewmodel-impl/trunk/impl/osgi.bnd (rev 0)
+++ core3/viewmodel-impl/trunk/impl/osgi.bnd 2010-11-19 01:24:27 UTC (rev
22919)
@@ -0,0 +1,7 @@
+#-----------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the bundle
+#-----------------------------------------------------------------
+
+Import-Package: *
+Private-Package: ${bundle.namespace}.internal.*
+
Copied: core3/viewmodel-impl/trunk/impl/pom.xml (from rev 22857,
core3/viewmodel-impl/trunk/pom.xml)
===================================================================
--- core3/viewmodel-impl/trunk/impl/pom.xml (rev 0)
+++ core3/viewmodel-impl/trunk/impl/pom.xml 2010-11-19 01:24:27 UTC (rev
22919)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <artifactId>viewmodel-impl-parent</artifactId>
+ <groupId>org.cytoscape</groupId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+
<bundle.symbolicName>org.cytoscape.viewmodel-impl</bundle.symbolicName>
+ <bundle.namespace>org.cytoscape.view.model</bundle.namespace>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+
+ <name>${bundle.symbolicName}</name>
+
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <version>1.4</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
<version>${maven-bundle-plugin.version}</version>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+
<Bundle-Version>${pom.version}</Bundle-Version>
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <!-- bootstrap for cytoscape , namely the parent POM snapshots
-->
+ <repository>
+ <id>cytoscape_snapshots</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <name>Cytoscape Snapshots</name>
+
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ <!-- bootstrap for cytoscape d, namely the parent POM releases
-->
+ <repository>
+ <id>cytoscape_releases</id>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <name>Cytoscape Releases</name>
+
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url>
+ </repository>
+
+ </repositories>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>service-util</artifactId>
+ <version>3.0.0-alpha1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ <scope>test</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>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Copied: core3/viewmodel-impl/trunk/impl/src (from rev 22857,
core3/viewmodel-impl/trunk/src)
Added: core3/viewmodel-impl/trunk/it/pom.xml
===================================================================
--- core3/viewmodel-impl/trunk/it/pom.xml (rev 0)
+++ core3/viewmodel-impl/trunk/it/pom.xml 2010-11-19 01:24:27 UTC (rev
22919)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <artifactId>viewmodel-impl-parent</artifactId>
+ <groupId>org.cytoscape</groupId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+
<bundle.symbolicName>org.cytoscape.viewmodel-impl-it</bundle.symbolicName>
+ <bundle.namespace>org.cytoscape.model</bundle.namespace>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl-it</artifactId>
+
+ <name>${bundle.symbolicName}</name>
+
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-config</id>
+ <goals>
+
<goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!--
+ <configuration>
+ <options>
+ <platform>felix</platform>
+ <profiles>spring.dm</profiles>
+ </options>
+ </configuration>
+ -->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <!-- bootstrap for cytoscape dependencies, namely the parent
POM snapshots -->
+ <repository>
+ <id>cytoscape_snapshots</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <name>Cytoscape Snapshots</name>
+
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ <!-- bootstrap for cytoscape dependencies, namely the parent
POM releases -->
+ <repository>
+ <id>cytoscape_releases</id>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <name>Cytoscape Releases</name>
+
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-impl</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>service-util</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>event-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>event-impl</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>integration-test-support</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>1.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <version>1.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
+ <version>1.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added:
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/view/model/ServiceConfigurationTest.java
===================================================================
---
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/view/model/ServiceConfigurationTest.java
(rev 0)
+++
core3/viewmodel-impl/trunk/it/src/test/java/org/cytoscape/view/model/ServiceConfigurationTest.java
2010-11-19 01:24:27 UTC (rev 22919)
@@ -0,0 +1,45 @@
+package org.cytoscape.view.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.integration.ServiceTestSupport;
+
+//@RunWith(MavenConfiguredJUnit4TestRunner.class)
+...@runwith(JUnit4TestRunner.class)
+public class ServiceConfigurationTest extends ServiceTestSupport {
+
+ @Configuration
+ public static Option[] configuration() {
+ return options(felix(),
+ profile("spring.dm"),
+ provision(
+
mavenBundle().groupId("org.cytoscape").artifactId("viewmodel-impl").versionAsInProject(),
+
mavenBundle().groupId("org.cytoscape").artifactId("viewmodel-api").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("service-util").versionAsInProject(),
+
mavenBundle().groupId("org.cytoscape").artifactId("integration-test-support").versionAsInProject()
+ ));
+ }
+
+ @Test
+ public void testExpectedServices() {
+ checkService(CyNetworkViewFactory.class);
+ checkService(CyNetworkViewManager.class);
+ }
+}
Deleted: core3/viewmodel-impl/trunk/osgi.bnd
===================================================================
--- core3/viewmodel-impl/trunk/osgi.bnd 2010-11-19 01:10:23 UTC (rev 22918)
+++ core3/viewmodel-impl/trunk/osgi.bnd 2010-11-19 01:24:27 UTC (rev 22919)
@@ -1,7 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-Import-Package: *
-Private-Package: ${bundle.namespace}.internal.*
-
Deleted: core3/viewmodel-impl/trunk/pom.xml
===================================================================
--- core3/viewmodel-impl/trunk/pom.xml 2010-11-19 01:10:23 UTC (rev 22918)
+++ core3/viewmodel-impl/trunk/pom.xml 2010-11-19 01:24:27 UTC (rev 22919)
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.cytoscape</groupId>
- <version>3.0.0-alpha3</version>
- </parent>
-
- <properties>
-
<bundle.symbolicName>org.cytoscape.viewmodel-impl</bundle.symbolicName>
- <bundle.namespace>org.cytoscape.view.model</bundle.namespace>
- </properties>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
- <artifactId>viewmodel-impl</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
-
- <name>${bundle.symbolicName}</name>
-
- <packaging>bundle</packaging>
-
- <scm>
-
<connection>scm:svn:http://chianti.ucsd.edu/svn/core3/viewmodel-impl/trunk</connection>
-
<developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/viewmodel-impl/trunk</developerConnection>
-
<url>http://chianti.ucsd.edu/svn/core3/viewmodel-impl/trunk</url>
- </scm>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!-- | example additional resource entries, useful when
building Eclipse
- RCP applications -->
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <filesets>
- <fileset>
-
<directory>${basedir}/eclipse_config</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
-
-
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <version>1.4</version>
- <!-- | enable improved OSGi compilation support
for the bundle life-cycle.
- | to switch back to the standard bundle
life-cycle, move this setting | down
- to the maven-bundle-plugin section -->
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>add-test-source</id>
-
<phase>generate-test-sources</phase>
- <goals>
-
<goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${basedir}/src/integration/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.6</version>
- <configuration>
-
<testSourceDirectory>${basedir}/src/integration/java</testSourceDirectory>
-
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
-
<goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
<version>${maven-bundle-plugin.version}</version>
- <!-- | the following instructions build a
simple set of public/private
- classes into an OSGi bundle -->
- <configuration>
- <instructions>
-
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-
<Bundle-Version>${pom.version}</Bundle-Version>
- <_include>-osgi.bnd</_include>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <!-- bootstrap for cytoscape , namely the parent POM snapshots
-->
- <repository>
- <id>cytoscape_snapshots</id>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <name>Cytoscape Snapshots</name>
-
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/snapshots/</url>
- </repository>
- <!-- bootstrap for cytoscape d, namely the parent POM releases
-->
- <repository>
- <id>cytoscape_releases</id>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <name>Cytoscape Releases</name>
-
<url>http://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url>
- </repository>
-
- </repositories>
-
-
- <dependencies>
-
- <!-- Cytoscape modules -->
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>service-util</artifactId>
- <version>3.0.0-alpha1</version>
- </dependency>
-
- <!-- for spring integration testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>integration-test-support</artifactId>
- <version>3.0.0-alpha2</version>
- <scope>test</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>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>viewmodel-api</artifactId>
- <version>3.0.0-alpha3-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
--
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.
