Bug 578297 - Modernize o.e.core.tests.runtime bundle Improve asserts to make them easier to read. Change-Id: I5c271187ff827ac441fb889785361bdb8bb58828 Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.runtime/+/189832 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java index 23e590a..3488f19 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java
@@ -1138,7 +1138,7 @@ count++; current = current.parent(); } - assertTrue("2.0." + count, count == 4); + assertEquals("2.0." + count, 4, count); } /*
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java index 4bfcdc4..e65d0ce 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java
@@ -46,7 +46,7 @@ URL oneSolution = FileLocator.find(bundle, path, map); assertNotNull(oneSolution); - assertTrue(oneSolution.getPath().equals(mostSpecificPath)); + assertEquals(mostSpecificPath, oneSolution.getPath()); assertBundleURL(oneSolution); URL[] solutions = FileLocator.findEntries(bundle, path, map); @@ -58,19 +58,19 @@ // Fragment/nl/aa/intro/messages.properties, // Bundle/121/intro/messages.properties - assertTrue(solutions.length == 5); + assertEquals(5, solutions.length); - assertTrue(solutions[0].getPath().equals(mostSpecificPath)); + assertEquals(mostSpecificPath, solutions[0].getPath()); assertBundleURL(solutions[0]); - assertTrue(solutions[1].getPath().equals(mostSpecificPath)); + assertEquals(mostSpecificPath, solutions[1].getPath()); assertFragmentURL(solutions[1]); - assertTrue(solutions[2].getPath().equals(lessSpecificPath)); + assertEquals(lessSpecificPath, solutions[2].getPath()); assertBundleURL(solutions[2]); - assertTrue(solutions[3].getPath().equals(lessSpecificPath)); + assertEquals(lessSpecificPath, solutions[3].getPath()); assertFragmentURL(solutions[3]); - assertTrue(solutions[4].getPath().equals(nonSpecificPath)); + assertEquals(nonSpecificPath, solutions[4].getPath()); assertBundleURL(solutions[4]); // remove the first bundle @@ -92,7 +92,7 @@ assertNotNull(file1); URL fileURL = FileLocator.toFileURL(context.getBundle().getEntry(RuntimeTestsPlugin.TEST_FILES_ROOT + "fileLocator/testFileLocatorGetRootFile")); - assertTrue(new File(fileURL.getFile()).equals(file1)); + assertEquals(file1, new File(fileURL.getFile())); // remove the bundle bundle.uninstall(); @@ -110,7 +110,7 @@ assertNotNull(file1); URL fileURL = FileLocator.toFileURL(context.getBundle().getEntry(RuntimeTestsPlugin.TEST_FILES_ROOT + "fileLocator/testFileLocatorGetRootFile.jar")); - assertTrue(new File(fileURL.getFile()).equals(file1)); + assertEquals(file1, new File(fileURL.getFile())); URL manifest = bundle.getEntry("META-INF/MANIFEST.MF"); manifest = FileLocator.resolve(manifest); @@ -143,12 +143,12 @@ private void assertBundleURL(URL url) { Bundle hostBundle = getHostBundle(url); assertNotNull(hostBundle); - assertTrue(hostBundle.getSymbolicName().equals("fileLocatorTest")); + assertEquals("fileLocatorTest", hostBundle.getSymbolicName()); } private void assertFragmentURL(URL url) { Bundle hostBundle = getHostBundle(url); assertNotNull(hostBundle); - assertTrue(hostBundle.getSymbolicName().equals("fileLocatorTest.nl")); + assertEquals("fileLocatorTest.nl", hostBundle.getSymbolicName()); } }
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLLocalTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLLocalTest.java index 5d85db6..e5abfd1 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLLocalTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLLocalTest.java
@@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.runtime; +import static org.junit.Assert.assertNotEquals; + import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -58,7 +60,7 @@ } catch (IOException e) { fail("2.0", e); } - assertFalse("3.0", platformURL.equals(resolvedURL)); + assertNotEquals("3.0", platformURL, resolvedURL); URL expected = null; try { expected = new URL(Platform.getConfigurationLocation().getURL(), "x"); @@ -82,7 +84,7 @@ } catch (IOException e) { fail("2.0", e); } - assertFalse("3.0", platformURL.equals(resolvedURL)); + assertNotEquals("3.0", platformURL, resolvedURL); URL expected = null; try { expected = new URL(RuntimeTestsPlugin.getPlugin().getStateLocation().toFile().toURI().toURL(), "x");
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLSessionTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLSessionTest.java index 9b209d1..0d78bdf 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLSessionTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformURLSessionTest.java
@@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.runtime; +import static org.junit.Assert.assertNotEquals; + import java.io.*; import java.net.*; import junit.framework.Test; @@ -61,8 +63,9 @@ String line = null; StringBuilder result = new StringBuilder(); try { - while ((line = reader.readLine()) != null) + while ((line = reader.readLine()) != null) { result.append(line); + } return result.toString(); } catch (IOException e) { fail(tag + ".99", e); @@ -82,8 +85,9 @@ suite.setReadOnly(true); suite.setCascaded(true); String[] ids = ConfigurationSessionTestSuite.MINIMAL_BUNDLE_SET; - for (String id : ids) + for (String id : ids) { suite.addBundle(id); + } suite.addBundle(PI_RUNTIME_TESTS); return suite; } @@ -148,12 +152,13 @@ } catch (IOException e) { // that is expected - parent configuration area is read-only } finally { - if (output != null) + if (output != null) { try { output.close(); } catch (IOException e) { // not interested } + } } } @@ -179,12 +184,13 @@ } catch (IOException e) { // that is expected - configuration area is read-only } finally { - if (output != null) + if (output != null) { try { output.close(); } catch (IOException e) { // not interested } + } } } @@ -210,7 +216,7 @@ } catch (IOException e) { fail("4.0", e); } - assertFalse("4.1", none.equals(resolvedURL)); + assertNotEquals("4.1", none, resolvedURL); assertTrue("4.2", resolvedURL.toExternalForm().startsWith(Platform.getConfigurationLocation().getURL().toExternalForm())); }
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java index 88f7d90..1a6c58c 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java
@@ -134,49 +134,49 @@ // test set/getString // give it a value ps.setValue(k1, v1); - assertTrue("2.0", ps.isDefault(k1) == false); + assertFalse("2.0", ps.isDefault(k1)); assertEquals("2.1", v1, ps.getString(k1)); assertEquals("2.2", Preferences.STRING_DEFAULT_DEFAULT, ps.getDefaultString(k1)); // change the value ps.setValue(k1, v2); - assertTrue("2.3", ps.isDefault(k1) == false); + assertFalse("2.3", ps.isDefault(k1)); assertEquals("2.4", v2, ps.getString(k1)); assertEquals("2.5", Preferences.STRING_DEFAULT_DEFAULT, ps.getDefaultString(k1)); // change to same value as default ps.setValue(k1, ps.getDefaultString(k1)); - assertTrue("2.6", ps.isDefault(k1) == true); + assertTrue("2.6", ps.isDefault(k1)); assertEquals("2.7", ps.getDefaultString(k1), ps.getString(k1)); assertEquals("2.8", Preferences.STRING_DEFAULT_DEFAULT, ps.getDefaultString(k1)); // reset to default ps.setValue(k1, v2); ps.setToDefault(k1); - assertTrue("2.9", ps.isDefault(k1) == true); + assertTrue("2.9", ps.isDefault(k1)); assertEquals("2.10", Preferences.STRING_DEFAULT_DEFAULT, ps.getString(k1)); assertEquals("2.11", Preferences.STRING_DEFAULT_DEFAULT, ps.getDefaultString(k1)); // change default ps.setDefault(k1, v1); - assertTrue("2.12", ps.isDefault(k1) == true); + assertTrue("2.12", ps.isDefault(k1)); assertEquals("2.13", v1, ps.getString(k1)); assertEquals("2.14", v1, ps.getDefaultString(k1)); // set the value ps.setValue(k1, v2); - assertTrue("2.15", ps.isDefault(k1) == false); + assertFalse("2.15", ps.isDefault(k1)); assertEquals("2.16", v2, ps.getString(k1)); assertEquals("2.17", v1, ps.getDefaultString(k1)); // change to same value as default ps.setValue(k1, ps.getDefaultString(k1)); - assertTrue("2.18", ps.isDefault(k1) == true); + assertTrue("2.18", ps.isDefault(k1)); assertEquals("2.19", ps.getDefaultString(k1), ps.getString(k1)); assertEquals("2.20", v1, ps.getDefaultString(k1)); // reset to default ps.setValue(k1, v2); ps.setToDefault(k1); - assertTrue("2.21", ps.isDefault(k1) == true); + assertTrue("2.21", ps.isDefault(k1)); assertEquals("2.22", v1, ps.getString(k1)); assertEquals("2.23", v1, ps.getDefaultString(k1)); // change default ps.setDefault(k1, v3); - assertTrue("2.24", ps.isDefault(k1) == true); + assertTrue("2.24", ps.isDefault(k1)); assertEquals("2.25", v3, ps.getString(k1)); assertEquals("2.26", v3, ps.getDefaultString(k1));
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java index 884ecf4..6659e0f 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
@@ -89,7 +89,7 @@ assertSame("Different values", Preferences.LONG_DEFAULT_DEFAULT, 0L); assertSame("Different values", Preferences.FLOAT_DEFAULT_DEFAULT, 0.0f); assertSame("Different values", Preferences.DOUBLE_DEFAULT_DEFAULT, 0.0); - assertTrue(Preferences.STRING_DEFAULT_DEFAULT.equals("")); + assertTrue(Preferences.STRING_DEFAULT_DEFAULT.isEmpty()); } public void testBasics() { @@ -103,18 +103,18 @@ // check that a random property in a newly created store // appearchs to have default-default values of whatever type asked for assertTrue("1.0", ps.isDefault(k1)); - assertTrue("1.1", ps.getBoolean(k1) == Preferences.BOOLEAN_DEFAULT_DEFAULT); - assertTrue("1.2", ps.getInt(k1) == Preferences.INT_DEFAULT_DEFAULT); - assertTrue("1.3", ps.getLong(k1) == Preferences.LONG_DEFAULT_DEFAULT); - assertTrue("1.4", ps.getFloat(k1) == Preferences.FLOAT_DEFAULT_DEFAULT); - assertTrue("1.5", ps.getDouble(k1) == Preferences.DOUBLE_DEFAULT_DEFAULT); + assertEquals("1.1", ps.getBoolean(k1), Preferences.BOOLEAN_DEFAULT_DEFAULT); + assertEquals("1.2", ps.getInt(k1), Preferences.INT_DEFAULT_DEFAULT); + assertEquals("1.3", ps.getLong(k1), Preferences.LONG_DEFAULT_DEFAULT); + assertEquals("1.4", ps.getFloat(k1), Preferences.FLOAT_DEFAULT_DEFAULT); + assertEquals("1.5", ps.getDouble(k1), Preferences.DOUBLE_DEFAULT_DEFAULT); assertTrue("1.6", ps.getString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT)); - assertTrue("1.7", ps.getDefaultBoolean(k1) == Preferences.BOOLEAN_DEFAULT_DEFAULT); - assertTrue("1.8", ps.getDefaultInt(k1) == Preferences.INT_DEFAULT_DEFAULT); - assertTrue("1.9", ps.getDefaultLong(k1) == Preferences.LONG_DEFAULT_DEFAULT); - assertTrue("1.10", ps.getDefaultFloat(k1) == Preferences.FLOAT_DEFAULT_DEFAULT); - assertTrue("1.11", ps.getDefaultDouble(k1) == Preferences.DOUBLE_DEFAULT_DEFAULT); + assertEquals("1.7", ps.getDefaultBoolean(k1), Preferences.BOOLEAN_DEFAULT_DEFAULT); + assertEquals("1.8", ps.getDefaultInt(k1), Preferences.INT_DEFAULT_DEFAULT); + assertEquals("1.9", ps.getDefaultLong(k1), Preferences.LONG_DEFAULT_DEFAULT); + assertEquals("1.10", ps.getDefaultFloat(k1), Preferences.FLOAT_DEFAULT_DEFAULT); + assertEquals("1.11", ps.getDefaultDouble(k1), Preferences.DOUBLE_DEFAULT_DEFAULT); assertTrue("1.12", ps.getDefaultString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT)); // test set/getString
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java index 8ed9d6a..0313d99 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java
@@ -351,7 +351,7 @@ job.setRule(rule1); job.schedule(); waitForEnd(job); - assertTrue("1.0", exception[0] != null); + assertNotNull("1.0", exception[0]); assertTrue("1.1", exception[0].getMessage().indexOf("does not match outer scope rule") > 0); }
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java index 09ee0ea..8ff40e7 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
@@ -691,35 +691,35 @@ //try finding all jobs from the first family result = manager.find(first); - assertTrue("2.0", result.length == 4); + assertEquals("2.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("2." + (i + 1), result[i].belongsTo(first)); } //try finding all jobs from the second family result = manager.find(second); - assertTrue("3.0", result.length == 4); + assertEquals("3.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("3." + (i + 1), result[i].belongsTo(second)); } //try finding all jobs from the third family result = manager.find(third); - assertTrue("4.0", result.length == 4); + assertEquals("4.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("4." + (i + 1), result[i].belongsTo(third)); } //try finding all jobs from the fourth family result = manager.find(fourth); - assertTrue("5.0", result.length == 4); + assertEquals("5.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("5." + (i + 1), result[i].belongsTo(fourth)); } //try finding all jobs from the fifth family result = manager.find(fifth); - assertTrue("6.0", result.length == 4); + assertEquals("6.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("6." + (i + 1), result[i].belongsTo(fifth)); } @@ -743,7 +743,7 @@ //finding all jobs from the second family should return all the jobs (they are just sleeping) result = manager.find(second); - assertTrue("8.0", result.length == 4); + assertEquals("8.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("8." + (i + 1), result[i].belongsTo(second)); } @@ -771,7 +771,7 @@ //finding all jobs from the third family should return all 4 jobs (1 is running, 1 is waiting, 2 are sleeping) result = manager.find(third); - assertTrue("10.0", result.length == 4); + assertEquals("10.0", 4, result.length); for (int i = 0; i < result.length; i++) { assertTrue("10." + (i + 1), result[i].belongsTo(third)); } @@ -872,7 +872,7 @@ //if the thread is complete then all jobs must be done if (currentStatus == TestBarrier.STATUS_DONE) { - assertTrue("2." + i, result.length == 0); + assertEquals("2." + i, 0, result.length); break; } sleep(100); @@ -935,7 +935,7 @@ TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_RUNNING); assertState("2.0", jobs[0], Job.RUNNING); - assertTrue("2.1", status[0] == TestBarrier.STATUS_RUNNING); + assertEquals("2.1", TestBarrier.STATUS_RUNNING, status[0]); //cancel the first family of jobs //the join call should be unblocked when all the jobs are canceled @@ -943,7 +943,7 @@ TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_DONE); //all jobs in the first family should be removed from the manager - assertTrue("2.2", manager.find(first).length == 0); + assertEquals("2.2", 0, manager.find(first).length); //cancel the second family of jobs manager.cancel(second); @@ -1003,7 +1003,7 @@ TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_RUNNING); assertState("2.0", jobs[0], Job.RUNNING); - assertTrue("2.1", status[0] == TestBarrier.STATUS_RUNNING); + assertEquals("2.1", TestBarrier.STATUS_RUNNING, status[0]); //cancel the monitor that is attached to the join call canceller.setCanceled(true); @@ -1011,7 +1011,7 @@ //the first job in the first family should still be running assertState("2.2", jobs[0], Job.RUNNING); - assertTrue("2.3", status[0] == TestBarrier.STATUS_DONE); + assertEquals("2.3", TestBarrier.STATUS_DONE, status[0]); assertTrue("2.4", manager.find(first).length > 0); //cancel the second family of jobs @@ -1159,13 +1159,13 @@ //let the thread execute the join call TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_START); - assertTrue("1.0", status[0] == TestBarrier.STATUS_START); + assertEquals("1.0", TestBarrier.STATUS_START, status[0]); long startTime = now(); status[0] = TestBarrier.STATUS_WAIT_FOR_RUN; TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_DONE); long endTime = now(); - assertTrue("2.0", status[0] == TestBarrier.STATUS_DONE); + assertEquals("2.0", TestBarrier.STATUS_DONE, status[0]); assertTrue("2.1", endTime > startTime); //the join call should take no actual time (join call should not block thread at all) @@ -1538,7 +1538,7 @@ waitForCancel(jobs[0]); //no job should now be running - assertTrue("4.0", manager.currentJob() == null); + assertNull("4.0", manager.currentJob()); for (int i = 1; i < NUM_JOBS; i++) { //all other jobs in the second family should be sleeping
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java index 8682240..31b4a91 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java
@@ -19,6 +19,8 @@ *******************************************************************************/ package org.eclipse.core.tests.runtime.jobs; +import static org.junit.Assert.assertNotEquals; + import java.util.Arrays; import org.eclipse.core.internal.jobs.JobManager; import org.eclipse.core.internal.jobs.Worker; @@ -68,10 +70,10 @@ waitForState(longJob, Job.NONE); //the done call should be ignored, and the job status should still be canceled - assertTrue("5.0", longJob.getResult().getSeverity() == IStatus.CANCEL); + assertEquals("5.0", IStatus.CANCEL, longJob.getResult().getSeverity()); longJob.done(Status.OK_STATUS); - assertTrue("6.0", longJob.getResult().getSeverity() == IStatus.CANCEL); + assertEquals("6.0", IStatus.CANCEL, longJob.getResult().getSeverity()); } @@ -105,12 +107,12 @@ //execute a job asynchronously and check the result AsynchTestJob main = new AsynchTestJob("Test Asynch Finish", status, 0); - assertTrue("1.0", main.getThread() == null); - assertTrue("2.0", main.getResult() == null); + assertNull("1.0", main.getThread()); + assertNull("2.0", main.getResult()); //schedule the job to run main.schedule(); TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_RUNNING); - assertTrue("3.0", main.getState() == Job.RUNNING); + assertEquals("3.0", Job.RUNNING, main.getState()); //the asynchronous process that assigns the thread the job is going to run in has not been started yet //the job is running in the thread provided to it by the manager assertTrue("3.1" + main.getThread().getName(), main.getThread() instanceof Worker); @@ -126,7 +128,7 @@ //make sure the job has set the thread it is going to run in TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_RUNNING); - assertTrue("3.3", status[0] == TestBarrier.STATUS_RUNNING); + assertEquals("3.3", TestBarrier.STATUS_RUNNING, status[0]); assertTrue("3.4", main.getThread() instanceof AsynchExecThread); //let the job run @@ -135,9 +137,9 @@ waitForState(main, Job.NONE); //after the job is finished, the thread should be reset - assertTrue("4.0", main.getState() == Job.NONE); - assertTrue("4.1", main.getResult().getSeverity() == IStatus.OK); - assertTrue("4.2", main.getThread() == null); + assertEquals("4.0", Job.NONE, main.getState()); + assertEquals("4.1", IStatus.OK, main.getResult().getSeverity()); + assertNull("4.2", main.getThread()); //reset status status[0] = TestBarrier.STATUS_WAIT_FOR_START; @@ -145,7 +147,7 @@ //schedule the job to run again main.schedule(); TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_RUNNING); - assertTrue("5.0", main.getState() == Job.RUNNING); + assertEquals("5.0", Job.RUNNING, main.getState()); //the asynchronous process that assigns the thread the job is going to run in has not been started yet //job is running in the thread provided by the manager @@ -162,7 +164,7 @@ //make sure the job has set the thread it is going to run in TestBarrier.waitForStatus(status, 0, TestBarrier.STATUS_RUNNING); - assertTrue("5.3", status[0] == TestBarrier.STATUS_RUNNING); + assertEquals("5.3", TestBarrier.STATUS_RUNNING, status[0]); assertTrue("5.4", main.getThread() instanceof AsynchExecThread); //cancel the job, then let the job get the cancellation request @@ -172,9 +174,9 @@ waitForState(main, Job.NONE); //thread should be reset to null after cancellation - assertTrue("6.0", main.getState() == Job.NONE); - assertTrue("6.1", main.getResult().getSeverity() == IStatus.CANCEL); - assertTrue("6.2", main.getThread() == null); + assertEquals("6.0", Job.NONE, main.getState()); + assertEquals("6.1", IStatus.CANCEL, main.getResult().getSeverity()); + assertNull("6.2", main.getThread()); } public void testAsynchJobComplex() { @@ -185,8 +187,8 @@ for (int i = 0; i < jobs.length; i++) { jobs[i] = new AsynchTestJob("TestJob" + (i + 1), status, i); - assertTrue("1." + i, jobs[i].getThread() == null); - assertTrue("2." + i, jobs[i].getResult() == null); + assertNull("1." + i, jobs[i].getThread()); + assertNull("2." + i, jobs[i].getResult()); jobs[i].schedule(); //status[i] = TestBarrier.STATUS_START; } @@ -195,7 +197,7 @@ //every job should now be waiting for the STATUS_START flag for (int i = 0; i < status.length; i++) { - assertTrue("3." + i, jobs[i].getState() == Job.RUNNING); + assertEquals("3." + i, Job.RUNNING, jobs[i].getState()); assertTrue("4." + i, jobs[i].getThread() instanceof Worker); status[i] = TestBarrier.STATUS_START; } @@ -245,8 +247,8 @@ for (int i = 0; i < jobs.length; i++) { jobs[i] = new AsynchTestJob("TestJob" + (i + 1), status, i); - assertTrue("1." + i, jobs[i].getThread() == null); - assertTrue("2." + i, jobs[i].getResult() == null); + assertNull("1." + i, jobs[i].getThread()); + assertNull("2." + i, jobs[i].getResult()); if (i < 2) { jobs[i].schedule(); } else if (i > 2) { @@ -261,7 +263,7 @@ //these 3 jobs should be waiting for the STATUS_START flag for (int i = 0; i < 3; i++) { TestBarrier.waitForStatus(status, i, TestBarrier.STATUS_RUNNING); - assertTrue("3." + i, jobs[i].getState() == Job.RUNNING); + assertEquals("3." + i, Job.RUNNING, jobs[i].getState()); assertTrue("4." + i, jobs[i].getThread() instanceof Worker); status[i] = TestBarrier.STATUS_START; } @@ -535,11 +537,11 @@ //schedule the job and wait on the barrier until it is running job.schedule(); barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_RUN); - assertTrue("1.0", canceling[0] == 0); + assertEquals("1.0", 0, canceling[0]); job.cancel(); - assertTrue("1.1", canceling[0] == 1); + assertEquals("1.1", 1, canceling[0]); job.cancel(); - assertTrue("1.2", canceling[0] == 1); + assertEquals("1.2", 1, canceling[0]); //let the job finish barrier.setStatus(TestBarrier.STATUS_RUNNING); waitForState(job, Job.NONE); @@ -648,8 +650,8 @@ } public void testGetName() { - assertTrue("1.0", shortJob.getName().equals("Short Test Job")); - assertTrue("1.1", longJob.getName().equals("Long Test Job")); + assertEquals("1.0", "Short Test Job", shortJob.getName()); + assertEquals("1.1", "Long Test Job", longJob.getName()); //try creating a job with a null name try { @@ -668,7 +670,7 @@ for (int i = 0; i < priority.length; i++) { shortJob.setPriority(priority[i]); - assertTrue("1." + i, shortJob.getPriority() == priority[i]); + assertEquals("1." + i, priority[i], shortJob.getPriority()); } } @@ -679,7 +681,7 @@ shortJob.setProperty(n1, null); assertNull("1.1", shortJob.getProperty(n1)); shortJob.setProperty(n1, shortJob); - assertTrue("1.2", shortJob.getProperty(n1) == shortJob); + assertEquals("1.2", shortJob.getProperty(n1), shortJob); assertNull("1.3", shortJob.getProperty(n2)); shortJob.setProperty(n1, "hello"); assertEquals("1.4", "hello", shortJob.getProperty(n1)); @@ -690,10 +692,10 @@ public void testGetResult() { //execute a short job - assertTrue("1.0", shortJob.getResult() == null); + assertNull("1.0", shortJob.getResult()); shortJob.schedule(); waitForState(shortJob, Job.NONE); - assertTrue("1.1", shortJob.getResult().getSeverity() == IStatus.OK); + assertEquals("1.1", IStatus.OK, shortJob.getResult().getSeverity()); //cancel a long job waitForState(longJob, Job.NONE); @@ -701,23 +703,23 @@ waitForState(longJob, Job.RUNNING); longJob.cancel(); waitForState(longJob, Job.NONE); - assertTrue("2.0", longJob.getResult().getSeverity() == IStatus.CANCEL); + assertEquals("2.0", IStatus.CANCEL, longJob.getResult().getSeverity()); } public void testGetRule() { //set several rules for the job, check if getRule returns the rule that was set //no rule was set yet - assertTrue("1.0", shortJob.getRule() == null); + assertNull("1.0", shortJob.getRule()); shortJob.setRule(new IdentityRule()); assertTrue("1.1", (shortJob.getRule() instanceof IdentityRule)); ISchedulingRule rule = new PathRule("/testGetRule"); shortJob.setRule(rule); - assertTrue("1.2", shortJob.getRule() == rule); + assertEquals("1.2", shortJob.getRule(), rule); shortJob.setRule(null); - assertTrue("1.3", shortJob.getRule() == null); + assertNull("1.3", shortJob.getRule()); } public void testGetThread() { @@ -725,17 +727,17 @@ //if the job is scheduled, only jobs that return the asynch_exec status will run in the indicated thread //main is not running now - assertTrue("1.0", shortJob.getThread() == null); + assertNull("1.0", shortJob.getThread()); Thread t = new Thread(); shortJob.setThread(t); - assertTrue("1.1", shortJob.getThread() == t); + assertEquals("1.1", shortJob.getThread(), t); shortJob.setThread(new Thread()); - assertTrue("1.2", shortJob.getThread() != t); + assertNotEquals("1.2", shortJob.getThread(), t); shortJob.setThread(null); - assertTrue("1.3", shortJob.getThread() == null); + assertNull("1.3", shortJob.getThread()); } public void testIsBlocking() { @@ -987,7 +989,7 @@ waitForState(job, Job.RUNNING); t.interrupt(); job.join(); - assertTrue("Thread not interrupted", job.getResult() == Status.CANCEL_STATUS); + assertEquals("Thread not interrupted", Status.CANCEL_STATUS, job.getResult()); } public void testJoinInterruptUIThread() throws InterruptedException { @@ -1013,7 +1015,7 @@ waitForState(job, Job.RUNNING); t.interrupt(); job.join(); - assertTrue("Thread interrupted", job.getResult() == Status.OK_STATUS); + assertEquals("Thread interrupted", Status.OK_STATUS, job.getResult()); } finally { Job.getJobManager().setLockListener(null); } @@ -1091,7 +1093,7 @@ } catch (InterruptedException e) { fail("Unexpected interrupt"); } - assertTrue("1.0", failure[0] != null); + assertNotNull("1.0", failure[0]); } /** @@ -1236,7 +1238,7 @@ status[0] = TestBarrier.STATUS_RUNNING; //make sure the job was not rescheduled while the executing job was sleeping waitForState(job, Job.NONE); - assertTrue("1.0", job.getState() == Job.NONE); + assertEquals("1.0", Job.NONE, job.getState()); assertEquals("1.0", 2, runCount[0]); } @@ -1501,54 +1503,54 @@ shortJob.setRule(new PathRule("/testSetRule/B/C/D")); assertTrue("1.2", shortJob.getRule() instanceof PathRule); shortJob.setRule(null); - assertTrue("1.3", shortJob.getRule() == null); + assertNull("1.3", shortJob.getRule()); } public void testSetThread() { //setting the thread of a job that is not an asynchronous job should not affect the actual thread the job will run in - assertTrue("0.0", longJob.getThread() == null); + assertNull("0.0", longJob.getThread()); longJob.setThread(Thread.currentThread()); - assertTrue("1.0", longJob.getThread() == Thread.currentThread()); + assertEquals("1.0", longJob.getThread(), Thread.currentThread()); longJob.schedule(); waitForState(longJob, Job.RUNNING); //the setThread method should have no effect on jobs that execute normally - assertTrue("2.0", longJob.getThread() != Thread.currentThread()); + assertNotEquals("2.0", longJob.getThread(), Thread.currentThread()); longJob.cancel(); waitForState(longJob, Job.NONE); //the thread should reset to null when the job finishes execution - assertTrue("3.0", longJob.getThread() == null); + assertNull("3.0", longJob.getThread()); longJob.setThread(null); - assertTrue("4.0", longJob.getThread() == null); + assertNull("4.0", longJob.getThread()); longJob.schedule(); waitForState(longJob, Job.RUNNING); //the thread that the job is executing in is not the one that was set - assertTrue("5.0 (state=" + JobManager.printState(longJob.getState()) + ')', longJob.getThread() != null); + assertNotNull("5.0 (state=" + JobManager.printState(longJob.getState()) + ')', longJob.getThread()); longJob.cancel(); waitForState(longJob, Job.NONE); //thread should reset to null after execution of job - assertTrue("6.0", longJob.getThread() == null); + assertNull("6.0", longJob.getThread()); Thread t = new Thread(); longJob.setThread(t); - assertTrue("7.0", longJob.getThread() == t); + assertEquals("7.0", longJob.getThread(), t); longJob.schedule(); waitForState(longJob, Job.RUNNING); //the thread that the job is executing in is not the one that it was set to - assertTrue("8.0", longJob.getThread() != t); + assertNotEquals("8.0", longJob.getThread(), t); longJob.cancel(); waitForState(longJob, Job.NONE); //execution thread should reset to null after job is finished - assertTrue("9.0", longJob.getThread() == null); + assertNull("9.0", longJob.getThread()); //when the state is changed to RUNNING, the thread should not be null final Thread[] thread = new Thread[1]; @@ -1601,21 +1603,4 @@ } } - /** - * A job was scheduled to run. Pause this thread so that a worker thread - * has a chance to finish the job - */ - // private void waitForEnd(Job job) { - // int i = 0; - // while(job.getState() != Job.NONE) { - // try { - // Thread.sleep(100); - // } catch (InterruptedException e) { - // - // } - // - // //sanity test to avoid hanging tests - // assertTrue("Timeout waiting for job to end", i++ < 1000); - // } - // } }
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java index e027bd1..eff6e98 100644 --- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java +++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
@@ -162,7 +162,7 @@ Thread after = getThread(); assertEquals("Thread not restored", before, after); assertTrue("Conflicting job not done", jobs[1].getResult().isOK()); - assertTrue("Conflicting job still running", jobs[1].getState() == Job.NONE); + assertEquals("Conflicting job still running", Job.NONE, jobs[1].getState()); return Status.OK_STATUS; } }; @@ -172,8 +172,8 @@ Job conflictingJob = new Job(getName() + " Conflicting") { @Override protected IStatus run(IProgressMonitor monitor) { - assertTrue(jobs[0].getState() == WAITING); - assertTrue(jobs[0].getResult() == null); + assertEquals(WAITING, jobs[0].getState()); + assertNull(jobs[0].getResult()); return Status.OK_STATUS; } }; @@ -195,13 +195,13 @@ Job yieldJob = new Job(getName() + " Yielding") { @Override protected IStatus run(IProgressMonitor monitor) { - assertTrue(jobs[1].getResult() == null); + assertNull(jobs[1].getResult()); while (yieldRule(null) == null) { //loop until yield succeeds } waitForCompletion(jobs[1]); assertTrue(jobs[1].getResult().isOK()); - assertTrue(jobs[1].getState() == Job.NONE); + assertEquals(Job.NONE, jobs[1].getState()); return Status.OK_STATUS; } }; @@ -212,7 +212,7 @@ @Override protected IStatus run(IProgressMonitor monitor) { assertEquals(WAITING, jobs[0].getState()); - assertTrue(jobs[0].getResult() == null); + assertNull(jobs[0].getResult()); return Status.OK_STATUS; } }; @@ -616,11 +616,11 @@ Job yieldJob = new Job(getName() + " Yielding") { @Override protected IStatus run(IProgressMonitor monitor) { - assertTrue(jobs[1].getResult() == null); + assertNull(jobs[1].getResult()); while (yieldRule(null) == null) { //loop until yield succeeds } - assertTrue(jobs[1].getState() == Job.WAITING); + assertEquals(Job.WAITING, jobs[1].getState()); return Status.OK_STATUS; } };