diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-29 08:53:34 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-29 08:53:34 +0000 |
| commit | 90f38c342e613edc24aef50ad56ebf5c0a46f6e1 (patch) | |
| tree | e0e516c27df66808502bb3d5e7a6c535c1077f9e /sca-java-2.x/trunk/samples | |
| parent | 79a0f89332ada0decd2caaee77e9102218462d6a (diff) | |
TUSCANY-3595 - Skipping regular tests (leave only OSGi based tests), and re-enable the test case
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@990513 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/samples')
| -rw-r--r-- | sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml | 131 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java | 2 |
2 files changed, 72 insertions, 61 deletions
diff --git a/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml index 2808c332b7..f42b117b6d 100644 --- a/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml @@ -86,65 +86,78 @@ </dependency> </dependencies> - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <buildcommands> - <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> - <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> - </buildcommands> - <projectnatures> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - <projectnature>org.eclipse.pde.PluginNature</projectnature> - </projectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> - </classpathContainers> - </configuration> - </plugin> + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <buildcommands> + <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> + <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> + </buildcommands> + <projectnatures> + <projectnature>org.eclipse.jdt.core.javanature</projectnature> + <projectnature>org.eclipse.pde.PluginNature</projectnature> + </projectnatures> + <classpathContainers> + <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> + </classpathContainers> + </configuration> + </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.6</version> + <configuration> + <skipTests>true</skipTests> + + <forkMode>never</forkMode> + </configuration> + </plugin> + + + <plugin> + <groupId>org.apache.tuscany.maven.plugins</groupId> + <artifactId>maven-osgi-junit-plugin</artifactId> + <version>1.0</version> + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-launcher-equinox</artifactId> + <version>${pom.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>osgi-test</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <systemProperties> + <property> + <name>osgi.configuration.area</name> + <value>${project.build.directory}/equinox</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-osgi-junit-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>osgi-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>osgi.configuration.area</name> - <value>${project.build.directory}/equinox</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> diff --git a/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java index 5c614da87b..406d190624 100644 --- a/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java +++ b/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java @@ -27,7 +27,6 @@ import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import com.meterware.httpunit.GetMethodWebRequest; @@ -38,7 +37,6 @@ import com.meterware.httpunit.WebResponse; /** * This shows how to test the Calculator composition. */ -@Ignore public class CalculatorTestCase { private final static String SERVICE_URL = "http://localhost:8085/calculator/"; |