Add additional waits when necessary

HFS+ under MacOSX has only second accuracy for file
modification times date resolution.

Author: adangel

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/EclipseUtils.java

@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
@@ -28,7 +27,6 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.IClasspathEntry;
@@ -49,21 +47,7 @@
  * @author Philippe Herlin
  * @author Brian Remedios
  */
-public class EclipseUtils {
-    static class OpenMonitor extends NullProgressMonitor {
-        private final CountDownLatch latch;
-
-        OpenMonitor(final CountDownLatch latch) {
-            this.latch = latch;
-        }
-
-        @Override
-        public void done() {
-            super.done();
-            latch.countDown();
-        }
-    }
-
+public final class EclipseUtils {
     /**
      * Because this class is a utility class, it cannot be instantiated
      */
@@ -377,6 +361,8 @@ public static void createFolders(IProject testProject, String fullpath) throws C
 
     public static void waitForJobs() throws InterruptedException {
         long start = System.currentTimeMillis();
+        Thread.sleep(500);
+
         while (!Job.getJobManager().isIdle()) {
             Thread.sleep(500);
 

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/WaitingMonitor.java

@@ -0,0 +1,24 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.eclipse;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+public class WaitingMonitor extends NullProgressMonitor {
+    private final CountDownLatch latch = new CountDownLatch(1);
+
+    @Override
+    public void done() {
+        super.done();
+        latch.countDown();
+    }
+
+    public void await() throws InterruptedException {
+        latch.await(30, TimeUnit.SECONDS);
+    }
+}

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCmdTest.java

@@ -31,6 +31,7 @@
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.eclipse.EclipseUtils;
 import net.sourceforge.pmd.eclipse.LoggingRule;
+import net.sourceforge.pmd.eclipse.WaitingMonitor;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
 import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
@@ -120,8 +121,16 @@ private IFile createMissingOverrideTestCase(IProject project) throws Exception {
               + "  void run() {\n" // line 2
               + "  }\n"
               + "}");
-        project.build(IncrementalProjectBuilder.FULL_BUILD, null);
-        project.refreshLocal(IResource.DEPTH_INFINITE, null);
+
+        WaitingMonitor monitor;
+        monitor = new WaitingMonitor();
+        project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+        monitor.await();
+
+        monitor = new WaitingMonitor();
+        project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+        monitor.await();
+
         return sourceFile;
     }
 

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/ExternalRuleSetFileTest.java

@@ -19,6 +19,7 @@
 
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.eclipse.EclipseUtils;
+import net.sourceforge.pmd.eclipse.LoggingRule;
 import net.sourceforge.pmd.eclipse.internal.ResourceUtil;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.cmd.BuildProjectCommand;
@@ -30,6 +31,9 @@
 public class ExternalRuleSetFileTest {
     private static final Logger LOG = LoggerFactory.getLogger(ExternalRuleSetFileTest.class);
 
+    @org.junit.Rule
+    public LoggingRule loggingRule = new LoggingRule();
+
     private static final String PMD_PROPERTIES_FILENAME = ".pmd";
 
     private static final String PROJECT_RULESET_FILENAME = ".pmd-ruleset.xml";
@@ -91,6 +95,7 @@ public void changedExternalRulesetShouldBeReloaded() throws Exception {
         Assert.assertEquals(1, projectRuleSet.getRules().size());
 
         // now let's change the ruleSetFile without eclipse knowing about it ("externally")
+        waitASecond();
         File ruleSetFileReal = ruleSetFile.getLocation().toFile();
         ResourceUtil.copyResource(this, "ruleset2.xml", ruleSetFileReal);
 
@@ -121,6 +126,7 @@ public void changedExternalRulesetShouldBeReloadedForPmdDisabledProjects() throw
             Assert.fail("File " + PROJECT_RULESET_FILENAME + " already exists!");
         }
         File ruleSetFileReal = ruleSetFile.getLocation().toFile();
+        waitASecond();
         ResourceUtil.copyResource(this, "ruleset1.xml", ruleSetFileReal);
 
         // now create the .pmd project properties without eclipse knowing about it ("externally")
@@ -192,6 +198,7 @@ public void externallyChangedProjectPropertiesShouldBeReloaded() throws Exceptio
             Assert.fail("File .pmd does not exist!");
         }
         File projectPropertiesFileReal = projectPropertiesFile.getLocation().toFile();
+        waitASecond();
         ResourceUtil.copyResource(this, "pmd-properties", projectPropertiesFileReal);
         LOG.debug("Overwritten {}", projectPropertiesFile);
 
@@ -215,4 +222,9 @@ public void externallyChangedProjectPropertiesShouldBeReloaded() throws Exceptio
         // need rebuild flag should be reset now
         Assert.assertFalse(model.isNeedRebuild());
     }
+
+    // HFS+ under MacOS has a date resolution of 1 second only
+    private void waitASecond() throws InterruptedException {
+        Thread.sleep(1000);
+    }
 }