Changed tests to use the new addon-manager

forge · Jul 15, 2013 · c7dc9d0 · c7dc9d0
1 parent 76369ab
commit c7dc9d0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/container-tests/pom.xml b/container-tests/pom.xml
@@ -69,6 +69,14 @@
          <version>2.0.0-SNAPSHOT</version>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>addon-manager-spi</artifactId>
+         <classifier>forge-addon</classifier>
+         <version>2.0.0-SNAPSHOT</version>
+         <scope>test</scope>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>

diff --git a/container-tests/src/test/java/test/org/jboss/forge/furnace/views/MultipleRepositoryTest.java b/container-tests/src/test/java/test/org/jboss/forge/furnace/views/MultipleRepositoryTest.java
@@ -14,9 +14,8 @@
 import org.jboss.forge.addon.convert.ConverterFactory;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
-import org.jboss.forge.addon.maven.dependencies.FileResourceFactory;
-import org.jboss.forge.addon.maven.dependencies.MavenContainer;
-import org.jboss.forge.addon.maven.dependencies.MavenDependencyResolver;
+import org.jboss.forge.addon.manager.spi.AddonDependencyResolver;
+import org.jboss.forge.addon.maven.addon.MavenAddonDependencyResolver;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.arquillian.ConfigurationScanListener;
 import org.jboss.forge.furnace.Furnace;
@@ -66,9 +65,8 @@ public void testAddonsCanReferenceDependenciesInOtherRepositories() throws IOExc
       AddonRepository left = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir1);
       AddonRepository right = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir2);
 
-      MavenDependencyResolver resolver = new MavenDependencyResolver(new FileResourceFactory(),
-               new MavenContainer());
-      AddonManager manager = new AddonManagerImpl(furnace, resolver);
+      AddonDependencyResolver resolver = new MavenAddonDependencyResolver();
+      AddonManager manager = new AddonManagerImpl(furnace, resolver, false);
 
       AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT");
       AddonId convert = AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT");
@@ -114,9 +112,8 @@ public void testAddonsDontFailIfDuplicatedInOtherRepositories() throws IOExcepti
       AddonRepository left = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir1);
       AddonRepository right = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir2);
 
-      MavenDependencyResolver resolver = new MavenDependencyResolver(new FileResourceFactory(),
-               new MavenContainer());
-      AddonManager manager = new AddonManagerImpl(furnace, resolver);
+      AddonDependencyResolver resolver = new MavenAddonDependencyResolver();
+      AddonManager manager = new AddonManagerImpl(furnace, resolver, false);
 
       AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT");
       AddonId convert = AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT");

diff --git a/...er-tests/src/test/java/test/org/jboss/forge/furnace/views/MultipleRepositoryViewTest.java b/...er-tests/src/test/java/test/org/jboss/forge/furnace/views/MultipleRepositoryViewTest.java
@@ -13,9 +13,8 @@
 
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
-import org.jboss.forge.addon.maven.dependencies.FileResourceFactory;
-import org.jboss.forge.addon.maven.dependencies.MavenContainer;
-import org.jboss.forge.addon.maven.dependencies.MavenDependencyResolver;
+import org.jboss.forge.addon.manager.spi.AddonDependencyResolver;
+import org.jboss.forge.addon.maven.addon.MavenAddonDependencyResolver;
 import org.jboss.forge.arquillian.ConfigurationScanListener;
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.Addon;
@@ -64,9 +63,8 @@ public void testAddonsSharedIfSubgraphEquivalent() throws IOException, Interrupt
       AddonRepository left = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir1);
       AddonRepository right = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir2);
 
-      MavenDependencyResolver resolver = new MavenDependencyResolver(new FileResourceFactory(),
-               new MavenContainer());
-      AddonManager manager = new AddonManagerImpl(furnace, resolver);
+      AddonDependencyResolver resolver = new MavenAddonDependencyResolver();
+      AddonManager manager = new AddonManagerImpl(furnace, resolver, false);
 
       AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0.Alpha5");
       AddonId convert = AddonId.from("org.jboss.forge.addon:convert", "2.0.0.Alpha5");
@@ -128,9 +126,8 @@ public void testAddonsDuplicatedIfSubgraphDiffers() throws IOException, Interrup
       AddonRepository left = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir1);
       AddonRepository right = furnace.addRepository(AddonRepositoryMode.MUTABLE, repodir2);
 
-      MavenDependencyResolver resolver = new MavenDependencyResolver(new FileResourceFactory(),
-               new MavenContainer());
-      AddonManager manager = new AddonManagerImpl(furnace, resolver);
+      AddonDependencyResolver resolver = new MavenAddonDependencyResolver();
+      AddonManager manager = new AddonManagerImpl(furnace, resolver, false);
 
       AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0.Alpha5");
       AddonId convert = AddonId.from("org.jboss.forge.addon:convert", "2.0.0.Alpha5");