Fix tests

9 files changed, 39 insertions, 33 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.releng.version.tests/.settings/org.eclipse.core.resources.prefs
index f06cc0ffca..2f874710f1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,9 @@
 eclipse.preferences.version=1
 encoding/.project=UTF-8
 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding//tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/.project=UTF-8
+encoding//tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1-feature/.project=UTF-8
+encoding//tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1/.project=UTF-8
+encoding//tests/00001-NoProblemAfterNewBaseline/clean/com.foo.releng/.project=UTF-8
+encoding//tests/00002-ProblemAfterChange/clean/com.foo.license-feature/.project=UTF-8
+encoding//tests/00002-ProblemAfterChange/clean/com.foo.project1/.project=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/src/org/eclipse/emf/cdo/releng/version/tests/VersionBuilderTest.java b/plugins/org.eclipse.emf.cdo.releng.version.tests/src/org/eclipse/emf/cdo/releng/version/tests/VersionBuilderTest.java
index 4bd1ee4877..d1feec55db 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/src/org/eclipse/emf/cdo/releng/version/tests/VersionBuilderTest.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/src/org/eclipse/emf/cdo/releng/version/tests/VersionBuilderTest.java
@@ -34,8 +34,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
 
@@ -48,8 +46,6 @@ public class VersionBuilderTest extends TestCase
 
   private static final String RESULTS_FILE = "results.txt";
 
-  private static final long BUILD_TIMEOUT = 10; // SECONDS
-
   private static final IWorkspace WORKSPACE = ResourcesPlugin.getWorkspace();
 
   private static final IWorkspaceRoot ROOT = WORKSPACE.getRoot();
@@ -75,7 +71,16 @@ public class VersionBuilderTest extends TestCase
   {
     MSG.println("Test " + getName());
     WORKSPACE.getDescription().setAutoBuilding(false);
-    clearWorkspace();
+
+    WORKSPACE.run(new IWorkspaceRunnable()
+    {
+      public void run(IProgressMonitor monitor) throws CoreException
+      {
+        clearWorkspace();
+      }
+    }, new NullProgressMonitor());
+
+    buildWorkspace(true);
 
     boolean clean = true;
     for (String phase : PHASES)
@@ -219,24 +224,14 @@ public class VersionBuilderTest extends TestCase
 
   private IMarker[] buildWorkspace(boolean clean) throws CoreException, InterruptedException
   {
-    final CountDownLatch done = new CountDownLatch(1);
-    IProgressMonitor monitor = new NullProgressMonitor()
+    if (clean)
     {
-      @Override
-      public void done()
-      {
-        done.countDown();
-        super.done();
-      }
-    };
-
-    int kind = clean ? IncrementalProjectBuilder.CLEAN_BUILD : IncrementalProjectBuilder.INCREMENTAL_BUILD;
-    WORKSPACE.build(kind, monitor);
-
-    if (!done.await(BUILD_TIMEOUT, TimeUnit.SECONDS))
+      WORKSPACE.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
+      WORKSPACE.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+    }
+    else
     {
-      monitor.setCanceled(true);
-      throw new RuntimeException("Build timed out");
+      WORKSPACE.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
     }
 
     return ROOT.findMarkers(Markers.MARKER_TYPE, false, IResource.DEPTH_INFINITE);
@@ -310,8 +305,8 @@ public class VersionBuilderTest extends TestCase
 
   private void addAttribute(StringBuilder builder, String key, Object value)
   {
-    String str = key + " = " + value;
-    msg("  " + str);
+    String str = "  " + key + " = " + value;
+    msg(str);
 
     builder.append(str);
     builder.append("\n");
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/.project b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/.project
index 07fbb3f2e9..d8eef10672 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/.project
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/.project
@@ -15,7 +15,7 @@
 			<arguments>
 				<dictionary>
 					<key>release.path</key>
-					<value>/org.eclipse.emf.cdo.releng/release.xml</value>
+					<value>/com.foo.releng/release.xml</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/feature.xml b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/feature.xml
index a1cc3a6129..d8b5763945 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/feature.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.license-feature/feature.xml
@@ -24,11 +24,4 @@
       <discovery label="Some update site name" url="http://www.foo.com"/>
    </url>
 
-   <plugin
-         id="com.foo.project1"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1-feature/.project b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1-feature/.project
index 07fbb3f2e9..d8eef10672 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1-feature/.project
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1-feature/.project
@@ -15,7 +15,7 @@
 			<arguments>
 				<dictionary>
 					<key>release.path</key>
-					<value>/org.eclipse.emf.cdo.releng/release.xml</value>
+					<value>/com.foo.releng/release.xml</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1/.project b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1/.project
index 5a4b01b9ad..6ea18fa139 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1/.project
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.project1/.project
@@ -15,7 +15,7 @@
 			<arguments>
 				<dictionary>
 					<key>release.path</key>
-					<value>/org.eclipse.emf.cdo.releng/release.xml</value>
+					<value>/com.foo.releng/release.xml</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.releng/release.properties b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.releng/release.properties
new file mode 100644
index 0000000000..d2fba970b1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00001-NoProblemAfterNewBaseline/clean/com.foo.releng/release.properties
@@ -0,0 +1 @@
+root.projects = com.foo.project1-feature
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/clean/com.foo.releng/release.properties b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/clean/com.foo.releng/release.properties
new file mode 100644
index 0000000000..d2fba970b1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/clean/com.foo.releng/release.properties
@@ -0,0 +1 @@
+root.projects = com.foo.project1-feature
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/incremental/results.txt b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/incremental/results.txt
index e69de29bb2..f7be5a0cd0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/incremental/results.txt
+++ b/plugins/org.eclipse.emf.cdo.releng.version.tests/tests/00002-ProblemAfterChange/incremental/results.txt
@@ -0,0 +1,10 @@
+Marker
+  <resource> = /com.foo.project1/META-INF/MANIFEST.MF
+  charEnd = 107
+  charStart = 102
+  lineNumber = 3
+  message = Version must be increased to 1.0.100 because the project's contents have changed
+  problemType = component.version
+  quickFixPattern = Bundle-Version: *(\d+(\.\d+(\.\d+)?)?)
+  quickFixReplacement = 1.0.100
+  severity = 2