Skip to content

Commit

Permalink
Merge pull request #628 from mbriskar/WINDUP-670
Browse files Browse the repository at this point in the history
WINDUP-670: Make Rexster more convenient to use
  • Loading branch information
lincolnthree committed Jul 13, 2015
2 parents 4f6229d + f963796 commit 5874ffe
Show file tree
Hide file tree
Showing 28 changed files with 356 additions and 195 deletions.
2 changes: 1 addition & 1 deletion bom/pom.xml
Expand Up @@ -4,7 +4,7 @@

<properties>
<version.forge>2.16.2.Final</version.forge>
<version.furnace>2.18.2.Final</version.furnace>
<version.furnace>2.19.0.Final</version.furnace>
<version.nexus.index>3</version.nexus.index>
</properties>

Expand Down
14 changes: 5 additions & 9 deletions config-groovy/tests/pom.xml
Expand Up @@ -39,14 +39,10 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
14 changes: 5 additions & 9 deletions config-xml/tests/pom.xml
Expand Up @@ -47,15 +47,11 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>
14 changes: 5 additions & 9 deletions config/tests/pom.xml
Expand Up @@ -54,14 +54,10 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
14 changes: 5 additions & 9 deletions exec/tests/pom.xml
Expand Up @@ -37,14 +37,10 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
14 changes: 5 additions & 9 deletions graph/tests/pom.xml
Expand Up @@ -46,15 +46,11 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>
16 changes: 6 additions & 10 deletions java-ast/tests/pom.xml
Expand Up @@ -31,16 +31,12 @@
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.exec</groupId>
<artifactId>windup-exec</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Expand Up @@ -17,7 +17,7 @@
<description>Migration Tools</description>

<properties>
<version.furnace>2.18.2.Final</version.furnace>
<version.furnace>2.19.0.Final</version.furnace>
<version.titangraph>0.5.4</version.titangraph>
<version.tinkerpop.blueprints>2.5.0</version.tinkerpop.blueprints>
<version.freemarker>2.3.23</version.freemarker>
Expand Down Expand Up @@ -59,6 +59,7 @@

<modules>
<module>bom</module>
<module>windup-test-harness</module>
<module>forks/fernflower</module>
<module>forks/frames</module>
<module>forks/procyon</module>
Expand Down
14 changes: 5 additions & 9 deletions reporting/tests/pom.xml
Expand Up @@ -62,15 +62,11 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.utils</groupId>
<artifactId>windup-utils</artifactId>
Expand Down
10 changes: 3 additions & 7 deletions rexster/tests/pom.xml
Expand Up @@ -34,13 +34,9 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
@@ -0,0 +1,74 @@
package org.jboss.windup.graph.rexster.test.debug;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.forge.arquillian.AddonDependencies;
import org.jboss.forge.arquillian.AddonDependency;
import org.jboss.forge.arquillian.archive.AddonArchive;
import org.jboss.forge.furnace.Furnace;
import org.jboss.forge.furnace.services.Imported;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.windup.config.furnace.FurnaceHolder;
import org.jboss.windup.graph.GraphContext;
import org.jboss.windup.graph.GraphContextFactory;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.io.IOException;
import java.net.Socket;

/**
* Tests that rexster is properly deployed thanks to Arquillian addon
*/
@RunWith(Arquillian.class)
public class RexsterDefaultDeploymentDebugTest
{
@Deployment
@AddonDependencies({
@AddonDependency(name = "org.jboss.windup.config:windup-config"),
@AddonDependency(name = "org.jboss.windup.graph:windup-graph"),
@AddonDependency(name = "org.jboss.forge.furnace.container:simple")
})
public static AddonArchive getDeployment()
{
System.setProperty("maven.surefire.debug", "true");
final AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
.addAsLocalServices(RexsterDefaultDeploymentDebugTest.class);

return archive;
}

@Test
public void testRexsterProperStart() throws IOException, InstantiationException, IllegalAccessException
{
Furnace furnace = FurnaceHolder.getFurnace();
Imported<GraphContextFactory> factory = furnace.getAddonRegistry().getServices(GraphContextFactory.class);
//GraphContext creation will start the rexster
try (GraphContext context = factory.get().create())
{
Socket s = null;
try
{
s = new Socket("localhost", 8182);
}
catch (Exception e)
{
Assert.fail("Rexster is not listening on localhost:8182");
}
finally
{
if (s != null)
try
{
s.close();
}
catch (Exception e)
{
}
}

}

}
}
@@ -0,0 +1,70 @@
package org.jboss.windup.graph.rexster.test.debug;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.forge.arquillian.AddonDependencies;
import org.jboss.forge.arquillian.AddonDependency;
import org.jboss.forge.arquillian.archive.AddonArchive;
import org.jboss.forge.furnace.Furnace;
import org.jboss.forge.furnace.services.Imported;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.windup.config.furnace.FurnaceHolder;
import org.jboss.windup.graph.GraphContext;
import org.jboss.windup.graph.GraphContextFactory;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.io.IOException;
import java.net.ConnectException;
import java.net.Socket;

/**
* Tests that rexster is not deployed by Arquillian addon in case debug mode is OFF.
*/
@RunWith(Arquillian.class)
public class RexsterDefaultDeploymentNoDebugTest
{
@Deployment
@AddonDependencies({
@AddonDependency(name = "org.jboss.windup.config:windup-config"),
@AddonDependency(name = "org.jboss.windup.graph:windup-graph"),
@AddonDependency(name = "org.jboss.forge.furnace.container:simple")
})
public static AddonArchive getDeployment()
{
final AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
.addAsLocalServices(RexsterDefaultDeploymentNoDebugTest.class);

return archive;
}

@Test(expected = ConnectException.class)
public void testRexsterProperStart() throws IOException, InstantiationException, IllegalAccessException
{
Furnace furnace = FurnaceHolder.getFurnace();
Imported<GraphContextFactory> factory = furnace.getAddonRegistry().getServices(GraphContextFactory.class);
try (GraphContext context = factory.get().create())
{
Socket s = null;
try
{
s = new Socket("localhost", 8182);
Assert.fail("Rexster should not be registered when not in debug mode.");
}
finally
{
if (s != null)
try
{
s.close();
}
catch (Exception e)
{
}
}

}

}
}
14 changes: 5 additions & 9 deletions rules-base/tests/pom.xml
Expand Up @@ -72,14 +72,10 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
14 changes: 5 additions & 9 deletions rules-java-archives/tests/pom.xml
Expand Up @@ -30,15 +30,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.exec</groupId>
<artifactId>windup-exec</artifactId>
Expand Down
14 changes: 5 additions & 9 deletions rules-java-ee/tests/pom.xml
Expand Up @@ -37,15 +37,11 @@

<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>furnace-test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.forge.furnace.test</groupId>
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.jboss.windup</groupId>
<artifactId>windup-test-harness</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.exec</groupId>
<artifactId>windup-exec</artifactId>
Expand Down

0 comments on commit 5874ffe

Please sign in to comment.