Fix gradle-tests after API refactoring

forge · Aug 5, 2013 · 3111ed8 · 3111ed8
1 parent bc0ee94
commit 3111ed8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 50 deletions.
diff --git a/...src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacetTest.java b/...src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacetTest.java
@@ -13,7 +13,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -246,24 +245,6 @@ public void testGetDirectManagedDependency()
       assertEquals("runtime", dep.getScopeType());
    }
 
-   @Test
-   public void testGetProperties()
-   {
-      Map<String, String> props = facet.getProperties();
-
-      assertEquals("https://github.com/forge/addon-gradle", props.get("githubRepo"));
-      assertEquals("JBoss", props.get("organization"));
-      assertNull(props.get("version"));
-   }
-
-   @Test
-   public void testGetProperty()
-   {
-      assertEquals("https://github.com/forge/addon-gradle", facet.getProperty("githubRepo"));
-      assertEquals("JBoss", facet.getProperty("organization"));
-      assertNull(facet.getProperty("group"));
-   }
-
    @Test
    public void testGetRepositories()
    {
@@ -367,20 +348,7 @@ public void testRemoveManagedDependency()
 
       ProjectAssert.assertNotContainsDependency(managedDeps, "compile", "name", "org.group", "1.0-SNAPSHOT");
    }
-
-   @Test
-   public void testRemoveProperty()
-   {
-      assertNotNull(facet.getProperty("githubRepo"));
-
-      facet.removeProperty("githubRepo");
-
-      Project sameProject = projectProvider.findProject();
-      DependencyFacet sameFacet = sameProject.getFacet(DependencyFacet.class);
-
-      assertNull(sameFacet.getProperty("githubRepo"));
-   }
-
+
    @Test
    public void testRemoveRepository()
    {
@@ -438,17 +406,4 @@ public void testResolveProperties()
       assertEquals("artifact", outputDep.getCoordinate().getArtifactId());
       assertEquals(".45", outputDep.getCoordinate().getVersion());
    }
-
-   @Test
-   public void testSetProperty()
-   {
-      assertEquals("JBoss", facet.getProperty("organization"));
-
-      facet.setProperty("organization", "EJB-OSS");
-
-      Project sameProject = projectProvider.findProject();
-      DependencyFacet sameFacet = sameProject.getFacet(DependencyFacet.class);
-
-      assertEquals("EJB-OSS", sameFacet.getProperty("organization"));
-   }
 }
diff --git a/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleMetadataFacetTest.java b/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleMetadataFacetTest.java
@@ -7,6 +7,9 @@
 package org.jboss.forge.addon.gradle.projects.facets;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -124,4 +127,35 @@ public void testGetOutputDependency()
       assertEquals("org.testproject", dep.getCoordinate().getGroupId());
       assertEquals("0.7", dep.getCoordinate().getVersion());
    }
+
+   @Test
+   public void testGetProperties()
+   {
+      Map<String, String> props = facet.getDirectProperties();
+
+      assertEquals("https://github.com/forge/addon-gradle", props.get("githubRepo"));
+      assertEquals("JBoss", props.get("organization"));
+      assertNull(props.get("version"));
+   }
+
+   @Test
+   public void testGetProperty()
+   {
+      assertEquals("https://github.com/forge/addon-gradle", facet.getDirectProperty("githubRepo"));
+      assertEquals("JBoss", facet.getDirectProperty("organization"));
+      assertNull(facet.getDirectProperty("group"));
+   }
+
+   @Test
+   public void testSetProperty()
+   {
+      assertEquals("JBoss", facet.getDirectProperty("organization"));
+
+      facet.setProperty("organization", "EJB-OSS");
+
+      Project sameProject = projectProvider.findProject();
+      MetadataFacet sameFacet = sameProject.getFacet(MetadataFacet.class);
+
+      assertEquals("EJB-OSS", sameFacet.getDirectProperty("organization"));
+   }
 }
diff --git a/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleResourceFacetTest.java b/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleResourceFacetTest.java
@@ -17,10 +17,10 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.addon.gradle.projects.ProjectAssert;
 import org.jboss.forge.addon.gradle.projects.GradleTestProjectProvider;
+import org.jboss.forge.addon.gradle.projects.ProjectAssert;
 import org.jboss.forge.addon.projects.Project;
-import org.jboss.forge.addon.projects.facets.ResourceFacet;
+import org.jboss.forge.addon.projects.facets.ResourcesFacet;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -51,13 +51,13 @@ public static ForgeArchive getDeployment()
    @Inject
    private GradleTestProjectProvider projectProvider;
    private Project project;
-   private ResourceFacet facet;
+   private ResourcesFacet facet;
 
    @Before
    public void setUp()
    {
       project = projectProvider.create();
-      facet = project.getFacet(ResourceFacet.class);
+      facet = project.getFacet(ResourcesFacet.class);
    }
 
    @After