Fixed deprecation warnings

forge · Apr 15, 2014 · 6ca4f08 · 6ca4f08
1 parent 453e64c
commit 6ca4f08
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 26 deletions.
diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java
@@ -92,8 +92,8 @@ public void testCDIFacet1_1OnlyInProject() throws Exception
    {
       Project project = projectFactory.createTempProject();
       facetFactory.install(project, CDIFacet_1_1.class);
-      projectFactory.invalidateCaches();      
-      project = projectFactory.findProject(project.getRootDirectory());
+      projectFactory.invalidateCaches();
+      project = projectFactory.findProject(project.getRoot());
       Assert.assertTrue(project.hasFacet(CDIFacet_1_1.class));
       Assert.assertFalse(project.hasFacet(CDIFacet_1_0.class));
    }
@@ -103,8 +103,8 @@ public void testCDIFacet1_0OnlyInProject() throws Exception
    {
       Project project = projectFactory.createTempProject();
       facetFactory.install(project, CDIFacet_1_0.class);
-      projectFactory.invalidateCaches();      
-      project = projectFactory.findProject(project.getRootDirectory());
+      projectFactory.invalidateCaches();
+      project = projectFactory.findProject(project.getRoot());
       Assert.assertTrue(project.hasFacet(CDIFacet_1_0.class));
       Assert.assertFalse(project.hasFacet(CDIFacet_1_1.class));
    }

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/FacesFacetShellTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/FacesFacetShellTest.java
@@ -31,7 +31,7 @@
 import org.junit.runner.RunWith;
 
 /**
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 @RunWith(Arquillian.class)
@@ -73,7 +73,7 @@ public void clearScreen() throws Exception
    public void testFacesFacetAvailability() throws Exception
    {
       Project project = projectHelper.createJavaLibraryProject();
-      shell.getShell().setCurrentResource(project.getRootDirectory());
+      shell.getShell().setCurrentResource(project.getRoot());
       shell.execute("faces-setup --facesVersion 2.0", 5, TimeUnit.SECONDS);
       Assert.assertTrue(project.hasFacet(FacesFacet.class));
       Assert.assertTrue(project.hasFacet(FacesFacet_2_0.class));
@@ -83,7 +83,7 @@ public void testFacesFacetAvailability() throws Exception
    public void testFacesFacetAvailabilityThroughShell() throws Exception
    {
       Project project = projectHelper.createJavaLibraryProject();
-      shell.getShell().setCurrentResource(project.getRootDirectory());
+      shell.getShell().setCurrentResource(project.getRoot());
       shell.execute("faces-setup --facesVersion 2.0", 5, TimeUnit.SECONDS);
       shell.execute("project-list-facets", 5, TimeUnit.SECONDS);
       Assert.assertThat(shell.getStdOut(), containsString("FacesFacet"));

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/FacesFacetTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/faces/FacesFacetTest.java
@@ -28,7 +28,7 @@
 import org.junit.runner.RunWith;
 
 /**
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 @RunWith(Arquillian.class)
@@ -163,7 +163,7 @@ public void testFacesFacetInstalledAfterProjectIsEvictedFromCache()
       Assert.assertTrue("Should have FacesFacet", project.hasFacet(FacesFacet.class));
       Assert.assertTrue("Should have FacesFacet_2_2", project.hasFacet(FacesFacet_2_2.class));
       projectFactory.invalidateCaches();
-      project = projectFactory.findProject(project.getRootDirectory());
+      project = projectFactory.findProject(project.getRoot());
       Assert.assertTrue("Should have FacesFacet", project.hasFacet(FacesFacet.class));
       Assert.assertTrue("Should have FacesFacet_2_2", project.hasFacet(FacesFacet_2_2.class));
 

diff --git a/...est/java/org/jboss/forge/addon/javaee/faces/ui/setup/FacesSetProjectStageCommandTest.java b/...est/java/org/jboss/forge/addon/javaee/faces/ui/setup/FacesSetProjectStageCommandTest.java
@@ -28,7 +28,7 @@
 import org.junit.runner.RunWith;
 
 /**
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
 @RunWith(Arquillian.class)
@@ -72,7 +72,7 @@ public void testSetProjectStage() throws Exception
       FacesFacet_2_2 facesFacet = projectHelper.installFaces_2_2(project);
       Assert.assertEquals(ProjectStage.Production, facesFacet.getProjectStage());
       try (CommandController controller = testHarness.createCommandController(FacesSetProjectStageCommand.class,
-               project.getRootDirectory()))
+               project.getRoot()))
       {
          controller.initialize();
          Assert.assertTrue(controller.isEnabled());

diff --git a/...tests/src/test/java/org/jboss/forge/addon/javaee/faces/ui/setup/FacesSetupWizardTest.java b/...tests/src/test/java/org/jboss/forge/addon/javaee/faces/ui/setup/FacesSetupWizardTest.java
@@ -67,19 +67,20 @@ public static ForgeArchive getDeployment()
    @Inject
    private UITestHarness testHarness;
 
+   @SuppressWarnings("unchecked")
    @Test
    public void testSetupCreatesFacesConfigXML() throws Exception
    {
       Project project = projectFactory.createTempProject();
       facetFactory.install(project, ServletFacet_3_1.class);
       try (CommandController tester = testHarness.createCommandController(FacesSetupWizard.class,
-               project.getRootDirectory()))
+               project.getRoot()))
       {
          tester.initialize();
          Assert.assertTrue(tester.isValid());
 
          Result result = tester.execute();
-         project = Projects.getSelectedProject(projectFactory, Selections.from(project.getRootDirectory()));
+         project = Projects.getSelectedProject(projectFactory, Selections.from(project.getRoot()));
          Assert.assertFalse(result instanceof Failed);
          Assert.assertTrue(project.hasFacet(FacesFacet.class));
          Assert.assertTrue(project.getFacet(FacesFacet.class).getConfigFile().exists());

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupWizardTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupWizardTest.java
@@ -90,7 +90,7 @@ public void testSetup() throws Exception
    {
       Project project = projectFactory.createTempProject();
       WizardCommandController tester = testHarness.createWizardController(JPASetupWizard.class,
-               project.getRootDirectory());
+               project.getRoot());
 
       tester.initialize();
 
@@ -120,13 +120,14 @@ public void postCommandExecuted(UICommand command, UIExecutionContext context, R
       Assert.assertEquals(2, counter.get());
 
       // Reload to refresh facets.
-      project = projectFactory.findProject(project.getRootDirectory());
+      project = projectFactory.findProject(project.getRoot());
 
       // Check SUT values
       PersistenceCommonDescriptor config = (PersistenceCommonDescriptor) project.getFacet(JPAFacet.class).getConfig();
       List<PersistenceUnitCommon> allUnits = config.getAllPersistenceUnit();
       Assert.assertEquals("java:jboss:jta-ds", allUnits.get(0).getJtaDataSource());
-      assertDefaultProviderProperties(allUnits.get(0).getOrCreateProperties(), project.getFacet(MetadataFacet.class).getProjectName());
+      assertDefaultProviderProperties(allUnits.get(0).getOrCreateProperties(), project.getFacet(MetadataFacet.class)
+               .getProjectName());
    }
 
    @Test
@@ -135,7 +136,7 @@ public void testSetupDuplicateUnitName() throws Exception
       // Execute SUT
       final Project project = projectFactory.createTempProject();
       WizardCommandController tester = testHarness.createWizardController(JPASetupWizard.class,
-               project.getRootDirectory());
+               project.getRoot());
 
       tester.initialize();
 
@@ -153,10 +154,11 @@ public void testSetupDuplicateUnitName() throws Exception
       // Check SUT values
       PersistenceCommonDescriptor config = (PersistenceCommonDescriptor) project.getFacet(JPAFacet.class).getConfig();
       List<PersistenceUnitCommon> allUnits = config.getAllPersistenceUnit();
-      Assert.assertEquals(project.getFacet(MetadataFacet.class).getProjectName() + PersistenceOperations.DEFAULT_UNIT_SUFFIX, allUnits.get(0).getName());
+      Assert.assertEquals(project.getFacet(MetadataFacet.class).getProjectName()
+               + PersistenceOperations.DEFAULT_UNIT_SUFFIX, allUnits.get(0).getName());
 
       WizardCommandController tester2 = testHarness.createWizardController(JPASetupWizard.class,
-               project.getRootDirectory());
+               project.getRoot());
 
       // Launch
       tester2.initialize();
@@ -175,8 +177,10 @@ public void testSetupDuplicateUnitName() throws Exception
       // Check SUT values
       config = (PersistenceCommonDescriptor) project.getFacet(JPAFacet.class).getConfig();
       allUnits = config.getAllPersistenceUnit();
-      Assert.assertEquals(project.getFacet(MetadataFacet.class).getProjectName() +PersistenceOperations.DEFAULT_UNIT_SUFFIX, allUnits.get(0).getName());
-      Assert.assertEquals(project.getFacet(MetadataFacet.class).getProjectName() +PersistenceOperations.DEFAULT_UNIT_SUFFIX + "-1", allUnits.get(1).getName());
+      Assert.assertEquals(project.getFacet(MetadataFacet.class).getProjectName()
+               + PersistenceOperations.DEFAULT_UNIT_SUFFIX, allUnits.get(0).getName());
+      Assert.assertEquals(project.getFacet(MetadataFacet.class).getProjectName()
+               + PersistenceOperations.DEFAULT_UNIT_SUFFIX + "-1", allUnits.get(1).getName());
    }
 
    @Test
@@ -185,7 +189,7 @@ public void testSetupMetadata() throws Exception
       // Execute SUT
       Project project = projectFactory.createTempProject();
       WizardCommandController tester = testHarness.createWizardController(JPASetupWizard.class,
-               project.getRootDirectory());
+               project.getRoot());
 
       tester.initialize();
 
@@ -213,7 +217,7 @@ public void postCommandExecuted(UICommand command, UIExecutionContext context, R
       Assert.assertEquals(2, counter.get());
 
       // Reload to refresh facets.
-      project = projectFactory.findProject(project.getRootDirectory());
+      project = projectFactory.findProject(project.getRoot());
 
       // Check SUT values
       PersistenceCommonDescriptor config = (PersistenceCommonDescriptor) project.getFacet(JPAFacet.class).getConfig();
@@ -230,8 +234,10 @@ private void assertDefaultProviderProperties(PropertiesCommon puProperties, Stri
    {
       assertPropertyValue(puProperties, "javax.persistence.schema-generation.database.action", "drop-and-create");
       assertPropertyValue(puProperties, "javax.persistence.schema-generation.scripts.action", "drop-and-create");
-      assertPropertyValue(puProperties, "javax.persistence.schema-generation.scripts.create-target", projectName + "Create.ddl");
-      assertPropertyValue(puProperties, "javax.persistence.schema-generation.scripts.drop-target", projectName + "Drop.ddl");
+      assertPropertyValue(puProperties, "javax.persistence.schema-generation.scripts.create-target", projectName
+               + "Create.ddl");
+      assertPropertyValue(puProperties, "javax.persistence.schema-generation.scripts.drop-target", projectName
+               + "Drop.ddl");
    }
 
    private void assertPropertyValue(PropertiesCommon puProperties, String name, String expectedValue)

diff --git a/...est/java/org/jboss/forge/addon/javaee/validation/ui/setup/ValidationSetupCommandTest.java b/...est/java/org/jboss/forge/addon/javaee/validation/ui/setup/ValidationSetupCommandTest.java
@@ -60,7 +60,7 @@ public void testNewEntity() throws Exception
    {
       final Project project = projectFactory.createTempProject();
       try (CommandController tester = testHarness.createCommandController(ValidationProviderSetupCommand.class,
-               project.getRootDirectory()))
+               project.getRoot()))
       {
          // Launch
          tester.initialize();