fix display of versioning
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 86e36de..e9555f2 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
@@ -106,14 +106,14 @@
}
- public void _testNumberOfFeatures() {
+ public void testNumberOfFeatures() {
String installDir = Platform.getInstallLocation().getURL().getPath();
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("nFeatures: " + features.length);
+ //assertEquals("there were more features than expected: ", EXPECTED_NUMBER_OF_FEATURES, nFeatures);
+ System.out.println("wtp releng tests show nFeatures=" + nFeatures);
}
@@ -130,7 +130,7 @@
for (int i = 0; i < plugins.length; i++) {
File aPlugin = plugins[i];
if (aPlugin.getName().indexOf("test") == -1) {
- if (!_testPluginFile(aPlugin)) {
+ if (!testPluginFile(aPlugin)) {
result.add(aPlugin.getPath());
}
}
@@ -149,18 +149,18 @@
}
- public void _testNumberOfPlugins() {
+ public void testNumberOfPlugins() {
String installDir = Platform.getInstallLocation().getURL().getPath();
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("nPlugins: " + plugins.length);
+ //assertEquals("there were more plugins than expected: ", EXPECTED_NUMBER_OF_PLUGINS, nPlugins);
+ System.out.println("wtp.releng tests shows nPlugins=" + nPlugins);
}
- private boolean _testPluginFile(File aPlugin) {
+ private boolean testPluginFile(File aPlugin) {
// Are we a doc plugin?
if (testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, ".zip")) {
@@ -330,8 +330,9 @@
VersionLister versionLister = new VersionLister();
String [] args = new String[] {"-testToReference", "WTPSDK152PLUSPATCHES", "-listToReferenceFile"};
- Object results = versionLister.run(args);
- assertEquals("There is an error in versioning. See full listing for details.", IPlatformRunnable.EXIT_OK, results);
+ Object result = versionLister.run(args);
+ boolean testok = (IPlatformRunnable.EXIT_OK.equals(result));
+ assertTrue("There is an error in versioning. See full listing for details.", testok);
}
}