Skip to content

Commit

Permalink
Upgrade to JBoss Modules 1.3.0.Final
Browse files Browse the repository at this point in the history
  • Loading branch information
lincolnthree committed Oct 31, 2013
1 parent 5e45baf commit 82dfffc
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 11 deletions.
4 changes: 2 additions & 2 deletions container/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>xml-parser</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.forge</groupId>
<artifactId>forge-jboss-modules</artifactId>
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace</groupId>
Expand Down
19 changes: 10 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<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">
<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>
Expand Down Expand Up @@ -43,15 +44,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.6</maven.compiler.source>

<!-- Build Info -->
<forge.scm.connection>scm:git:git://github.com/forge/furnace.git</forge.scm.connection>
<forge.developer.connection>scm:git:git@github.com:forge/furnace.git</forge.developer.connection>
<forge.scm.url>http://github.com/forge/furnace</forge.scm.url>
<forge.release.codename>Fire it Up</forge.release.codename>
<forge.release.version>${project.version}</forge.release.version>
<version.javassist>1</version.javassist>
<version.jboss.modules>3</version.jboss.modules>
<version.jboss.modules>1.3.0.Final</version.jboss.modules>
<version.junit>4.11</version.junit>
<version.org.jboss.logmanager.jboss-logmanager>1.4.1.Final</version.org.jboss.logmanager.jboss-logmanager>
<version.surefire.plugin>2.16</version.surefire.plugin>
Expand Down Expand Up @@ -119,8 +120,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.forge</groupId>
<artifactId>forge-jboss-modules</artifactId>
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules</artifactId>
<version>${version.jboss.modules}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -320,7 +321,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -337,7 +338,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -354,7 +355,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -373,7 +374,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package org.jboss.arquillian.test.impl;

import org.jboss.arquillian.core.api.Instance;
import org.jboss.arquillian.core.api.InstanceProducer;
import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.arquillian.core.api.annotation.Observes;
import org.jboss.arquillian.core.spi.EventContext;
import org.jboss.arquillian.test.spi.TestClass;
import org.jboss.arquillian.test.spi.annotation.ClassScoped;
import org.jboss.arquillian.test.spi.context.ClassContext;
import org.jboss.arquillian.test.spi.context.SuiteContext;
import org.jboss.arquillian.test.spi.context.TestContext;
import org.jboss.arquillian.test.spi.event.suite.After;
import org.jboss.arquillian.test.spi.event.suite.AfterClass;
import org.jboss.arquillian.test.spi.event.suite.ClassEvent;
import org.jboss.arquillian.test.spi.event.suite.SuiteEvent;
import org.jboss.arquillian.test.spi.event.suite.TestEvent;

/**
* TestContextHandler
*
* @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
public class TestContextHandler
{
@Inject
private Instance<SuiteContext> suiteContextInstance;

@Inject
private Instance<ClassContext> classContextInstance;

@Inject
private Instance<TestContext> testContextInstance;

@Inject
@ClassScoped
private InstanceProducer<TestClass> testClassProducer;

public void createSuiteContext(@Observes(precedence = 100) EventContext<SuiteEvent> context)
{
SuiteContext suiteContext = this.suiteContextInstance.get();
try
{
suiteContext.activate();
context.proceed();
}
finally
{
suiteContext.deactivate();
}
}

public void createClassContext(@Observes(precedence = 100) EventContext<ClassEvent> context)
{
ClassContext classContext = this.classContextInstance.get();
try
{
classContext.activate(context.getEvent().getTestClass().getJavaClass());
testClassProducer.set(context.getEvent().getTestClass());
context.proceed();
}
finally
{
classContext.deactivate();
if (AfterClass.class.isAssignableFrom(context.getEvent().getClass()))
classContext.destroy(context.getEvent().getTestClass().getJavaClass());
}
}

public void createTestContext(@Observes(precedence = 100) EventContext<TestEvent> context)
{
TestContext testContext = this.testContextInstance.get();
try
{
testContext.activate(context.getEvent().getTestInstance());
context.proceed();
}
finally
{
testContext.deactivate();
if (After.class.isAssignableFrom(context.getEvent().getClass()))
testContext.destroy(context.getEvent().getTestInstance());
}
}
}

0 comments on commit 82dfffc

Please sign in to comment.