You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/05/04 11:26:05 UTC
svn commit: r1830909 - in /webservices/axiom/trunk/systests: ./
eclipse-tests/src/it/project/META-INF/ eclipse-tests/src/it/project/src/
psychopath-tests/ psychopath-tests/src/ psychopath-tests/src/test/
psychopath-tests/src/test/java/ psychopath-tests...
Author: veithen
Date: Fri May 4 11:26:04 2018
New Revision: 1830909
URL: http://svn.apache.org/viewvc?rev=1830909&view=rev
Log:
Run Psychopath tests as a normal Maven project.
Added:
webservices/axiom/trunk/systests/psychopath-tests/ (with props)
webservices/axiom/trunk/systests/psychopath-tests/pom.xml
- copied, changed from r1830908, webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
webservices/axiom/trunk/systests/psychopath-tests/src/
webservices/axiom/trunk/systests/psychopath-tests/src/test/
webservices/axiom/trunk/systests/psychopath-tests/src/test/java/
webservices/axiom/trunk/systests/psychopath-tests/src/test/java/PsychoPathTest.java
- copied, changed from r1830908, webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/PsychoPathTest.java
webservices/axiom/trunk/systests/psychopath-tests/src/test/resources/
webservices/axiom/trunk/systests/psychopath-tests/src/test/resources/test.xml
- copied unchanged from r1830908, webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/test.xml
Removed:
webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/PsychoPathTest.java
webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/test.xml
Modified:
webservices/axiom/trunk/systests/eclipse-tests/src/it/project/META-INF/MANIFEST.MF
webservices/axiom/trunk/systests/pom.xml
Modified: webservices/axiom/trunk/systests/eclipse-tests/src/it/project/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/src/it/project/META-INF/MANIFEST.MF?rev=1830909&r1=1830908&r2=1830909&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/src/it/project/META-INF/MANIFEST.MF (original)
+++ webservices/axiom/trunk/systests/eclipse-tests/src/it/project/META-INF/MANIFEST.MF Fri May 4 11:26:04 2018
@@ -4,8 +4,5 @@ Bundle-SymbolicName: eclipse-tests-proje
Bundle-Version: 0.0.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.apache.axiom.om,
- org.apache.axiom.om.dom,
- org.eclipse.wst.xml.xpath2.api,
- org.eclipse.wst.xml.xpath2.processor,
- org.eclipse.wst.xml.xpath2.processor.util
+ org.apache.axiom.om.dom
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Modified: webservices/axiom/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/pom.xml?rev=1830909&r1=1830908&r2=1830909&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/pom.xml (original)
+++ webservices/axiom/trunk/systests/pom.xml Fri May 4 11:26:04 2018
@@ -38,6 +38,7 @@
<module>wildfly-tests</module>
<module>old-tests</module>
<module>osgi-tests</module>
+ <module>psychopath-tests</module>
<module>spring-ws-tests</module>
<module>wss4j-tests</module>
</modules>
Propchange: webservices/axiom/trunk/systests/psychopath-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 4 11:26:04 2018
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Copied: webservices/axiom/trunk/systests/psychopath-tests/pom.xml (from r1830908, webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/psychopath-tests/pom.xml?p2=webservices/axiom/trunk/systests/psychopath-tests/pom.xml&p1=webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml&r1=1830908&r2=1830909&rev=1830909&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml (original)
+++ webservices/axiom/trunk/systests/psychopath-tests/pom.xml Fri May 4 11:26:04 2018
@@ -21,14 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>@project.groupId@</groupId>
- <artifactId>eclipse-tests</artifactId>
- <version>@project.version@</version>
- <relativePath>../../../pom.xml</relativePath>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>systests</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
- <artifactId>eclipse-tests-project</artifactId>
- <packaging>eclipse-test-plugin</packaging>
+ <artifactId>psychopath-tests</artifactId>
<repositories>
<repository>
@@ -42,6 +40,38 @@
</repository>
</repositories>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>osgi.bundle</groupId>
+ <artifactId>org.eclipse.wst.xml.xpath2.processor</artifactId>
+ <version>2.1.100.v201211261519</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>osgi.bundle</groupId>
+ <artifactId>java_cup.runtime</artifactId>
+ <version>0.10.0.v201005080400</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -57,51 +87,13 @@
</rules>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <dependencies>
- <dependency>
- <type>eclipse-plugin</type>
- <artifactId>org.apache.ws.commons.axiom.axiom-impl</artifactId>
- </dependency>
- <dependency>
- <type>eclipse-plugin</type>
- <artifactId>org.apache.ws.commons.axiom.axiom-dom</artifactId>
- </dependency>
- </dependencies>
- <argLine>${jacoco.surefireArgLine}</argLine>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <!-- For some reason maven-source-plugin causes problems here; deactivate it -->
- <id>source-jars</id>
- <phase>none</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
+ <extensions>
+ <extension>
+ <groupId>com.github.veithen.cosmos</groupId>
+ <artifactId>p2-maven-connector</artifactId>
+ <version>0.3</version>
+ </extension>
+ </extensions>
</build>
</project>
Copied: webservices/axiom/trunk/systests/psychopath-tests/src/test/java/PsychoPathTest.java (from r1830908, webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/PsychoPathTest.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/psychopath-tests/src/test/java/PsychoPathTest.java?p2=webservices/axiom/trunk/systests/psychopath-tests/src/test/java/PsychoPathTest.java&p1=webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/PsychoPathTest.java&r1=1830908&r2=1830909&rev=1830909&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/src/it/project/src/PsychoPathTest.java (original)
+++ webservices/axiom/trunk/systests/psychopath-tests/src/test/java/PsychoPathTest.java Fri May 4 11:26:04 2018
@@ -35,8 +35,6 @@ import org.w3c.dom.Document;
/**
* Tests that Axiom's DOM implementation is interoperable with the PsychoPath XPath 2.0 processor.
*/
-// Note: This test is placed here because PsychoPath is not available from Maven central, but only
-// from the Eclipse P2 repositories.
public class PsychoPathTest {
private static ResultSequence evaluate(String xpath) throws Exception {
InputStream is = PsychoPathTest.class.getResourceAsStream("test.xml");