updated reference data
diff --git a/tests/org.eclipse.wtp.releng.tests/.classpath b/tests/org.eclipse.wtp.releng.tests/.classpath
index 7398f97..ce73933 100644
--- a/tests/org.eclipse.wtp.releng.tests/.classpath
+++ b/tests/org.eclipse.wtp.releng.tests/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry path="src" kind="src"/>
- <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
- <classpathentry path="bin" kind="output"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.wtp.releng.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wtp.releng.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..ba969fa
--- /dev/null
+++ b/tests/org.eclipse.wtp.releng.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Apr 11 14:27:08 EDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wtp.releng.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wtp.releng.tests/META-INF/MANIFEST.MF
index 41cf488..48ed268 100644
--- a/tests/org.eclipse.wtp.releng.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wtp.releng.tests/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
org.junit;bundle-version="[3.8.0,4.0.0)",
org.eclipse.callisto.tools.versionchecker
Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
index 61a3f33..3193572 100644
--- a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
+++ b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
@@ -10,14 +10,22 @@
*******************************************************************************/
package org.eclipse.wtp.releng.tests;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
+
import junit.framework.TestCase;
import org.eclipse.callisto.tools.versionchecker.VersionLister;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.app.IApplication;
public class BuildTests extends TestCase {
@@ -67,8 +75,8 @@
private static final String REQUIRED_BUNDLE_SUFFIX = ".jar";
private static final String[] SUFFIX_EXEMPT_LIST = {"org.eclipse.swt","org.apache.ant"};
- private static final int EXPECTED_NUMBER_OF_FEATURES = 100;
- private static final int EXPECTED_NUMBER_OF_PLUGINS = 380;
+ private static final int EXPECTED_NUMBER_OF_FEATURES = 116;
+ private static final int EXPECTED_NUMBER_OF_PLUGINS = 461;
/**
* Constructor for EmptyDirectoriesTest.
@@ -112,8 +120,8 @@
File featureDir = new File(installDir, "features");
File[] features = featureDir.listFiles();
int nFeatures = features.length;
- //assertEquals("there were more features than expected: ", EXPECTED_NUMBER_OF_FEATURES, nFeatures);
- System.out.println("wtp releng tests show nFeatures=" + nFeatures);
+ assertEquals("there were more or less features than expected: ", EXPECTED_NUMBER_OF_FEATURES, nFeatures);
+ //System.out.println("wtp releng tests show nFeatures=" + nFeatures);
}
@@ -154,8 +162,8 @@
File pluginDir = new File(installDir, "plugins");
File[] plugins = pluginDir.listFiles();
int nPlugins = plugins.length;
- //assertEquals("there were more plugins than expected: ", EXPECTED_NUMBER_OF_PLUGINS, nPlugins);
- System.out.println("wtp.releng tests shows nPlugins=" + nPlugins);
+ assertEquals("there were more or less plugins than expected: ", EXPECTED_NUMBER_OF_PLUGINS, nPlugins);
+ //System.out.println("wtp.releng tests shows nPlugins=" + nPlugins);
}
@@ -233,7 +241,7 @@
index = aDirectory.getName().length();
}
- String plainName = aDirectory.getName().substring(0, index);
+ //String plainName = aDirectory.getName().substring(0, index);
/*
if (requiredSuffix.equals("")
@@ -329,9 +337,9 @@
public void testVersionCompare() throws Exception {
VersionLister versionLister = new VersionLister();
- String [] args = new String[] {"-testToReference", "RC1.5.3", "-listToReferenceFile"};
+ String [] args = new String[] {"-testToReference", "1.5.4", "-listToReferenceFile"};
Object result = versionLister.run(args);
- boolean testok = (IPlatformRunnable.EXIT_OK.equals(result));
+ boolean testok = (IApplication.EXIT_OK.equals(result));
assertTrue("There is an error in versioning. See full listing for details.", testok);
}