Repository: aries-rsa Updated Branches: refs/heads/master 619417b9c -> a6945ded6
[ARIES-1675] TCK Tests Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/a6945ded Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/a6945ded Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/a6945ded Branch: refs/heads/master Commit: a6945ded6e648e45373a6206eb23fd5379687940 Parents: 619417b Author: Christian Schneider <[email protected]> Authored: Fri Jan 27 18:17:20 2017 +0100 Committer: Christian Schneider <[email protected]> Committed: Fri Jan 27 18:17:20 2017 +0100 ---------------------------------------------------------------------- .gitignore | 2 + itests/tck/README.md | 19 +++ itests/tck/install/install-tests.sh | 6 + itests/tck/pom.xml | 119 +++++++++++++++++++ itests/tck/tck.bndrun | 34 ++++++ tck/apply-to-tck.sh.template | 15 --- ...gi.impl.service.remoteserviceadmin-4.3.0.lib | 5 - 7 files changed, 180 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 92c90d6..ca2256e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ target/ velocity.log *.md.html .idea/ +generated/ + http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/itests/tck/README.md ---------------------------------------------------------------------- diff --git a/itests/tck/README.md b/itests/tck/README.md new file mode 100644 index 0000000..02aa4fe --- /dev/null +++ b/itests/tck/README.md @@ -0,0 +1,19 @@ +# TCK Tests + +## Install tests from tck + +Call install-tests.sh with the path to the directory where the test jars reside. + + sh install/install-tests.sh ~/checkout/osgi_ct_enterprise/jar + +This installs the tests to your local maven repo and only needs to be done once. + +## Build the index + + mvn package + + +## Run the tests + +TODO + http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/itests/tck/install/install-tests.sh ---------------------------------------------------------------------- diff --git a/itests/tck/install/install-tests.sh b/itests/tck/install/install-tests.sh new file mode 100644 index 0000000..5937493 --- /dev/null +++ b/itests/tck/install/install-tests.sh @@ -0,0 +1,6 @@ +mvn org.apache.maven.plugins:maven-install-plugin:install-file -Dfile=$1/org.osgi.test.cases.remoteserviceadmin-5.0.0.jar \ + -DgroupId=org.osgi.test.cases \ + -DartifactId=org.osgi.test.cases.remoteserviceadmin \ + -Dversion=5.0.0 \ + -Dpackaging=jar \ + -DgeneratePom=true http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/itests/tck/pom.xml ---------------------------------------------------------------------- diff --git a/itests/tck/pom.xml b/itests/tck/pom.xml new file mode 100644 index 0000000..b9ed054 --- /dev/null +++ b/itests/tck/pom.xml @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> +<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";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.aries.rsa</groupId> + <artifactId>org.apache.aries.rsa.itests</artifactId> + <version>1.10-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.apache.aries.rsa.itests</groupId> + <artifactId>org.apache.aries.rsa.itests.tck</artifactId> + <packaging>jar</packaging> + + <name>Aries Remote Service Admin itests tck</name> + + <properties> + <paxlogging.version>1.8.5</paxlogging.version> + </properties> + + <dependencies> + + <!-- Test cases from the tck. These need to be deployed by hand as + redistribution is not allowed --> + <dependency> + <groupId>org.osgi.test.cases</groupId> + <artifactId>org.osgi.test.cases.remoteserviceadmin</artifactId> + <version>5.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.aries.rsa</groupId> + <artifactId>repository</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + + <!-- Test framework --> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd</artifactId> + <version>2.4.0</version> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.junit</artifactId> + <version>3.8.2_2</version> + </dependency> + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>3.8.0.v20120529-1548</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${paxlogging.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-service</artifactId> + <version>${paxlogging.version}</version> + <scope>test</scope> + </dependency> + + <!-- Needed compendium services --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>1.8.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-indexer-maven-plugin</artifactId> + <version>3.3.0</version> + <configuration> + <localURLs>REQUIRED</localURLs> + </configuration> + <executions> + <execution> + <id>index</id> + <goals> + <goal>index</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + +</project> + http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/itests/tck/tck.bndrun ---------------------------------------------------------------------- diff --git a/itests/tck/tck.bndrun b/itests/tck/tck.bndrun new file mode 100644 index 0000000..2be4494 --- /dev/null +++ b/itests/tck/tck.bndrun @@ -0,0 +1,34 @@ +-standalone: target/index.xml + +-runtrace = true + +-target = \ + org.osgi.test.cases.remoteserviceadmin + +-runproperties = \ + report="true", \ + osgi.resolverMode="strict" + +-runsystempackages=javax.xml.stream; version=1.0, javax.xml.stream.events; version=1.0, javax.xml.stream.util; version=1.0 +-runfw: org.eclipse.osgi;version='[3.8.0.v20120529-1548,3.8.0.v20120529-1548]' +-runee: JavaSE-1.8 +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.osgi.test.cases.remoteserviceadmin)',\ + osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\ + osgi.identity;filter:='(osgi.identity=org.ops4j.pax.logging.pax-logging-service)' + +-runblacklist: \ + osgi.identity;filter:='(osgi.identity=osgi.cmpn)',\ + osgi.identity;filter:='(osgi.identity=slf4j.api)' +-runbundles: \ + org.apache.aries.rsa.core;version='[1.10.0,1.10.1)',\ + org.apache.aries.rsa.discovery.config;version='[1.10.0,1.10.1)',\ + org.apache.aries.rsa.provider.tcp;version='[1.10.0,1.10.1)',\ + org.apache.aries.rsa.spi;version='[1.10.0,1.10.1)',\ + org.apache.aries.rsa.topology-manager;version='[1.10.0,1.10.1)',\ + org.apache.felix.configadmin;version='[1.8.0,1.8.1)',\ + org.apache.felix.eventadmin;version='[1.4.2,1.4.3)',\ + org.apache.servicemix.bundles.junit;version='[3.8.2,3.8.3)',\ + org.osgi.test.cases.remoteserviceadmin;version='[5.0.0,5.0.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\ + org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/tck/apply-to-tck.sh.template ---------------------------------------------------------------------- diff --git a/tck/apply-to-tck.sh.template b/tck/apply-to-tck.sh.template deleted file mode 100755 index b6d4455..0000000 --- a/tck/apply-to-tck.sh.template +++ /dev/null @@ -1,15 +0,0 @@ -#This script pretends the current build to be the same as the version in the R5 TCK repo. -#This puts the wrong version numbers on the files copied to the repo, so it could be improved -#but it keeps changes to a minimum. -# -#Run this script before executing the CT tests to get the CT tests to run with the current CXF DOSGi build - -TCK_HOME=... the osgi build clone root directory... -ZOOKEEPER_JAR=... the zookeeper server jar, can be obtained from a zookeeper download... -cp $ZOOKEEPER_JAR $TCK_HOME/licensed/repo/org.apache.cxf.dosgi.discovery.zookeeper/org.apache.cxf.dosgi.discovery.zookeeper-1.2.0.jar - -cp org.osgi.impl.service.remoteserviceadmin-4.3.0.lib $TCK_HOME/cnf/repo/org.osgi.impl.service.remoteserviceadmin - -cp ../distribution/single-bundle/target/cxf-dosgi-ri-singlebundle-distribution-1.5-SNAPSHOT.jar $TCK_HOME/licensed/repo/org.apache.cxf.dosgi.singlebundle/org.apache.cxf.dosgi.singlebundle-1.3.1.jar -cp ../discovery/distributed/zookeeper-server/target/cxf-dosgi-ri-discovery-distributed-zookeeper-server-1.5-SNAPSHOT.jar $TCK_HOME/licensed/repo/org.apache.cxf.dosgi.discovery.server/org.apache.cxf.dosgi.discovery.server-1.2.0.jar -cp ../discovery/distributed/zookeeper-server-config/target/cxf-dosgi-ri-discovery-distributed-zookeeper-server-config-1.5-SNAPSHOT.jar $TCK_HOME/licensed/repo/org.apache.cxf.dosgi.discovery.server.config/org.apache.cxf.dosgi.discovery.server.config-1.2.0.jar http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/a6945ded/tck/org.osgi.impl.service.remoteserviceadmin-4.3.0.lib ---------------------------------------------------------------------- diff --git a/tck/org.osgi.impl.service.remoteserviceadmin-4.3.0.lib b/tck/org.osgi.impl.service.remoteserviceadmin-4.3.0.lib deleted file mode 100644 index 66a532c..0000000 --- a/tck/org.osgi.impl.service.remoteserviceadmin-4.3.0.lib +++ /dev/null @@ -1,5 +0,0 @@ -org.apache.cxf.dosgi.singlebundle; version=1.3.1 -com.springsource.org.apache.log4j; version=1.2.15 -slf4j.api; version=1.6.1 -slf4j.nop; version=1.6.1 -
