Skip to content

Commit

Permalink
Tests should use new coordinates, too.
Browse files Browse the repository at this point in the history
  • Loading branch information
lincolnthree committed Aug 2, 2013
1 parent 8f34146 commit 939d6c6
Show file tree
Hide file tree
Showing 28 changed files with 63 additions and 63 deletions.
Expand Up @@ -32,7 +32,7 @@ public class ContainerServiceDetectionTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
Expand All @@ -44,7 +44,7 @@ public static ForgeArchive getDeployment()
ImplementingClass1.class,
ImplementingClass2.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -29,7 +29,7 @@ public class ContainerServiceMultipleInstanceTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
Expand All @@ -41,7 +41,7 @@ public static ForgeArchive getDeployment()
ImplementingClass2.class
)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -26,7 +26,7 @@ public class ContainerServiceSingleInstanceTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
Expand All @@ -37,7 +37,7 @@ public static ForgeArchive getDeployment()
ImplementingClass2.class
)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -18,13 +18,13 @@ public class ForgeGetVersionIsCallableTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -20,13 +20,13 @@ public class XPathLookupTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -24,15 +24,15 @@ public class AddonCDIExtensionTest
{
@Deployment(order = 2)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addClasses(TestExtension.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addAsServiceProvider(Extension.class, TestExtension.class);

Expand Down
Expand Up @@ -26,7 +26,7 @@ public class AddonDependencyInjectionTest
{
@Deployment(order = 2)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
Expand All @@ -36,7 +36,7 @@ public static ForgeArchive getDeployment()
.addBeansXML()
.addAsServiceProvider(Extension.class, TestExtension.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("dependency", "2")
);

Expand All @@ -49,7 +49,7 @@ public static ForgeArchive getDependencyDeployment()
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class, "dependency.jar")
.addClasses(PublishedService.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -22,15 +22,15 @@ public class AddonIncludingJARsTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap
.create(ForgeArchive.class)
.addAsLibrary("cdi-api-1.0.jar", "cdi-api.jar")
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -28,14 +28,14 @@ public class AddonInjectableAPIsTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addClasses(ServiceBean.class, ServiceInterface.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -23,14 +23,14 @@ public class AddonSelfInjectionExposedServiceTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDependencyDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addClasses(PublishedService.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -23,14 +23,14 @@ public class AddonSelfInjectionTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addClasses(NonService.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -22,15 +22,15 @@ public class ClassLoadingOnlyAddonTest
{
@Deployment(order = 1)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addClass(PublishedService.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("noncdi", "1")
);

Expand Down
Expand Up @@ -40,15 +40,15 @@ public class AddonInstancesAreSingletonsTest
{
@Deployment
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap
.create(ForgeArchive.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
);

return archive;
Expand All @@ -71,7 +71,7 @@ public void testInstallingAddonWithSingleOptionalAddonDependency() throws Interr
*/
Addon example = registry.getAddon(mockAddon);
Assert.assertTrue(((MutableAddonRepository) repository).deploy(mockAddon, Arrays.asList(AddonDependencyEntry
.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT", false)), null));
.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT", false)), null));
Assert.assertTrue(((MutableAddonRepository) repository).enable(mockAddon));
Addons.waitUntilStarted(example, 10, TimeUnit.SECONDS);
Assert.assertEquals(addonCount + 1, registry.getAddons().size());
Expand Down
Expand Up @@ -28,7 +28,7 @@ public static ForgeArchive getDeployment()
.create(ForgeArchive.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("dependency", "2")
);

Expand All @@ -37,14 +37,14 @@ public static ForgeArchive getDeployment()

@Deployment(name = "dependency,2", testable = false, order = 2)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDependencyDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class, "dependency.jar")
.addClasses(PublishedService.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -24,13 +24,13 @@ public class AddonMissingOptionalDependencyNotNull
{
@Deployment(order = 3)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -29,15 +29,15 @@ public class AddonMultipleDependencyVersionTest
{
@Deployment(order = 1)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
ForgeArchive archive = ShrinkWrap
.create(ForgeArchive.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("dep", "1"),
AddonDependencyEntry.create("dep", "2")
);
Expand All @@ -52,7 +52,7 @@ public static ForgeArchive getDeploymentDep1()
.create(ForgeArchive.class)
.addClass(LifecycleListenerService.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand All @@ -66,7 +66,7 @@ public static ForgeArchive getDeploymentDep2()
.create(ForgeArchive.class)
.addClasses(LifecycleListenerService.class, PublishedService.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -39,7 +39,7 @@ public static ForgeArchive getDeployment()
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
.addClass(ServiceInterface.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand All @@ -48,7 +48,7 @@ public static ForgeArchive getDeployment()

@Deployment(name = "primer,1", order = 1)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeploymentPrimer()
{
Expand Down
Expand Up @@ -25,7 +25,7 @@ public class AddonEventPropagationNonRemoteTest
{
@Deployment(order = 2)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
Expand All @@ -34,7 +34,7 @@ public static ForgeArchive getDeployment()
.addClasses(EventService.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("dependency", "1")
);

Expand All @@ -47,7 +47,7 @@ public static ForgeArchive getDependencyDeployment()
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class, "dependency.jar")
.addClasses(EventResponseService.class, EventPayload2.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT")
)
.addBeansXML();

Expand Down
Expand Up @@ -26,7 +26,7 @@ public class AddonEventPropagationRemoteTest
{
@Deployment(order = 1)
@Dependencies({
@AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT")
@AddonDependency(name = "org.jboss.forge.furnace.container:cdi", version = "2.0.0-SNAPSHOT")
})
public static ForgeArchive getDeployment()
{
Expand All @@ -35,7 +35,7 @@ public static ForgeArchive getDeployment()
.addClasses(EventService.class, EventPayload1.class)
.addBeansXML()
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
AddonDependencyEntry.create("dependencyA", "1")
);

Expand All @@ -48,7 +48,7 @@ public static ForgeArchive getDependencyDeployment()
ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class, "dependencyA.jar")
.addClasses(EventResponseService.class, EventPayload3.class)
.addAsAddonDependencies(
AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT", false)
AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT", false)
)
.addBeansXML();

Expand Down

0 comments on commit 939d6c6

Please sign in to comment.