Skip to content

Commit

Permalink
Switch to using harness project
Browse files Browse the repository at this point in the history 
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1912 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
@pmuir
pmuir committed Mar 11, 2009
1 parent a708600 commit d468c72
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
20 changes: 10 additions & 10 deletions jboss-tck-runner/pom.xml
View file
Expand Up @@ -163,7 +163,7 @@
</suiteXmlFiles>
<systemProperties>
<property>
<name>org.jboss.jsr299.tck.standalone</name>
<name>org.jboss.testharness.standalone</name>
<value>false</value>
</property>
<property>
Expand All @@ -175,11 +175,11 @@
<value>false</value>
</property>
<property>
<name>org.jboss.jsr299.tck.libraryDirectory</name>
<name>org.jboss.testharness.libraryDirectory</name>
<value>target/dependency/lib</value>
</property>
<property>
<name>org.jboss.jsr299.tck.runIntegrationTests</name>
<name>org.jboss.testharness.runIntegrationTests</name>
<value>true</value>
</property>
</systemProperties>
Expand All @@ -206,7 +206,7 @@
</suiteXmlFiles>
<systemProperties>
<property>
<name>org.jboss.jsr299.tck.standalone</name>
<name>org.jboss.testharness.standalone</name>
<value>false</value>
</property>
<property>
Expand All @@ -218,15 +218,15 @@
<value>true</value>
</property>
<property>
<name>org.jboss.jsr299.tck.runIntegrationTests</name>
<name>org.jboss.testharness.runIntegrationTests</name>
<value>true</value>
</property>
<property>
<name>org.jboss.jsr299.tck.libraryDirectory</name>
<name>org.jboss.testharness.libraryDirectory</name>
<value>target/dependency/lib</value>
</property>
<property>
<name>org.jboss.jsr299.tck.outputDirectory</name>
<name>org.jboss.testharness.outputDirectory</name>
<value>target</value>
</property>
</systemProperties>
Expand Down Expand Up @@ -257,18 +257,18 @@
</execution>
</executions>
<configuration>
<mainClass>org.jboss.jsr299.tck.api.TCK</mainClass>
<mainClass>org.jboss.testharness.api.TCK</mainClass>
<systemProperties>
<systemProperty>
<key>dumpArtifacts</key>
<value>true</value>
</systemProperty>
<systemProperty>
<key>org.jboss.jsr299.tck.outputDirectory</key>
<key>org.jboss.testharness.outputDirectory</key>
<value>target/jsr299-artifacts</value>
</systemProperty>
<systemProperty>
<key>org.jboss.jsr299.tck.libraryDirectory</key>
<key>org.jboss.testharness.libraryDirectory</key>
<value>target/dependency/lib</value>
</systemProperty>
</systemProperties>
Expand Down
6 changes: 3 additions & 3 deletions ...nner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
View file
Expand Up @@ -12,9 +12,9 @@
import java.net.URLConnection;

import org.apache.log4j.Logger;
import org.jboss.jsr299.tck.api.Configurable;
import org.jboss.jsr299.tck.api.Configuration;
import org.jboss.jsr299.tck.spi.Containers;
import org.jboss.testharness.api.Configurable;
import org.jboss.testharness.api.Configuration;
import org.jboss.testharness.spi.Containers;
import org.jboss.webbeans.tck.integration.jbossas.util.DeploymentProperties;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
View file
Expand Up @@ -14,10 +14,10 @@
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
import org.jboss.deployers.spi.management.deploy.DeploymentStatus;
import org.jboss.jsr299.tck.api.DeploymentException;
import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.testharness.api.DeploymentException;
import org.jboss.virtual.VFS;

public class ProfileServiceContainersImpl extends AbstractContainersImpl
Expand Down
8 changes: 4 additions & 4 deletions jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties
View file
@@ -1,4 +1,4 @@
org.jboss.jsr299.tck.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.ProfileServiceContainersImpl
org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher
org.jboss.jsr299.tck.connectDelay=1500
org.jboss.jsr299.tck.connectRetries=8
org.jboss.testharness.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.ProfileServiceContainersImpl
org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
org.jboss.testharness.connectDelay=1500
org.jboss.testharness.connectRetries=8
6 changes: 3 additions & 3 deletions jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
View file
@@ -1,7 +1,7 @@
# Configuration for running incontainer tests from your IDE
# Alter the path webbeans accordingly (relative from the tck/impl dir)
org.jboss.jsr299.tck.standalone=false
org.jboss.testharness.standalone=false
jboss-as.dir=../../webbeans/jboss-as
jboss.force.restart=false
org.jboss.jsr299.tck.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib
org.jboss.jsr299.tck.runIntegrationTests=true
org.jboss.testharness.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib
org.jboss.testharness.runIntegrationTests=true
2 changes: 1 addition & 1 deletion porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java
View file
@@ -1,8 +1,8 @@
package org.jboss.webbeans.tck;

import org.jboss.jsr299.tck.spi.Contexts;
import org.jboss.webbeans.context.AbstractMapContext;
import org.jboss.webbeans.context.AbstractContext;
import org.jboss.webbeans.context.AbstractMapContext;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.context.RequestContext;

Expand Down
4 changes: 2 additions & 2 deletions porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
View file
Expand Up @@ -4,8 +4,8 @@
import java.net.URL;
import java.util.List;

import org.jboss.jsr299.tck.api.DeploymentException;
import org.jboss.jsr299.tck.spi.StandaloneContainers;
import org.jboss.testharness.api.DeploymentException;
import org.jboss.testharness.spi.StandaloneContainers;
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.mock.MockLifecycle;
Expand Down
2 changes: 1 addition & 1 deletion porting-package/src/main/resources/META-INF/web-beans-tck.properties
View file
@@ -1,5 +1,5 @@
org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl
org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl
org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl
org.jboss.jsr299.tck.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl
org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl
org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl

0 comments on commit d468c72

Please sign in to comment.