Bug 564857 - use AssertJ
Added org.assertj dependency and replaced hamcrest asserts.
Change-Id: I8246409ae465c559ff19f646fe41361f38e692a2
Signed-off-by: Julian Honnen <julian.honnen@vector.com>
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF
index 56823e1..cdeb50c 100644
--- a/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: PDE JUnit Runtime Tests
Bundle-SymbolicName: org.eclipse.pde.junit.runtime.tests;singleton:=true
-Bundle-Version: 3.5.700.qualifier
+Bundle-Version: 3.5.800.qualifier
Automatic-Module-Name: org.eclipse.pde.junit.runtime.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse.org
Bundle-ActivationPolicy: lazy
Eclipse-BundleShape: dir
Require-Bundle: org.junit,
- org.hamcrest.library;bundle-version="1.3.0",
org.eclipse.core.runtime;bundle-version="3.15.400",
org.eclipse.pde.launching;bundle-version="3.7.700",
org.eclipse.core.resources;bundle-version="3.13.500",
@@ -17,4 +16,5 @@
org.eclipse.jdt.junit;bundle-version="3.11.500",
org.eclipse.jdt.core;bundle-version="3.19.0",
org.eclipse.debug.ui;bundle-version="3.14.200",
- org.eclipse.ui;bundle-version="3.114.0"
+ org.eclipse.ui;bundle-version="3.114.0",
+ org.assertj;bundle-version="3.14.0"
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/pom.xml b/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
index f4e346b..f6a138a 100644
--- a/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
+++ b/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.junit.runtime.tests</artifactId>
- <version>3.5.700-SNAPSHOT</version>
+ <version>3.5.800-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/JUnitExecutionTest.java b/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/JUnitExecutionTest.java
index 32c4260..9af4bf7 100644
--- a/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/JUnitExecutionTest.java
+++ b/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/JUnitExecutionTest.java
@@ -13,9 +13,7 @@
*******************************************************************************/
package org.eclipse.pde.junit.runtime.tests;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsArrayWithSize.arrayWithSize;
-import static org.hamcrest.core.Is.is;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
import java.net.URL;
@@ -94,7 +92,7 @@
IType testClass = input.findType("Test1");
ITestRunSession session = TestExecutionUtil.runTest(testClass);
- assertThat(session.getChildren(), is(arrayWithSize(1)));
+ assertThat(session.getChildren()).hasSize(1);
assertSuccessful(session);
}
@@ -103,7 +101,7 @@
IPackageFragment testPackage = input.findType("Test1").getPackageFragment();
ITestRunSession session = TestExecutionUtil.runTest(testPackage);
- assertThat(session.getChildren(), is(arrayWithSize(2)));
+ assertThat(session.getChildren()).hasSize(2);
assertSuccessful(session);
}
@@ -111,7 +109,7 @@
public void executeProject() throws Exception {
ITestRunSession session = TestExecutionUtil.runTest(input.project);
- assertThat(session.getChildren(), is(arrayWithSize(2)));
+ assertThat(session.getChildren()).hasSize(2);
assertSuccessful(session);
}
@@ -120,7 +118,7 @@
IMethod testMethod = input.findType("Test1").getMethod("test1", new String[0]);
ITestRunSession session = TestExecutionUtil.runTest(testMethod);
- assertThat(session.getChildren(), is(arrayWithSize(1)));
+ assertThat(session.getChildren()).hasSize(1);
assertSuccessful(session);
}
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/TestExecutionUtil.java b/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/TestExecutionUtil.java
index 0dada5d..9635049 100644
--- a/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/TestExecutionUtil.java
+++ b/ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/TestExecutionUtil.java
@@ -14,9 +14,7 @@
package org.eclipse.pde.junit.runtime.tests;
import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.core.Is.is;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import java.io.File;
@@ -63,7 +61,7 @@
List<IMarker> errorMarkers = Arrays.stream(project.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE)) //
.filter(m -> m.getAttribute(IMarker.SEVERITY, 0) == IMarker.SEVERITY_ERROR) //
.collect(toList());
- assertThat("error markers in " + project, errorMarkers, is(empty()));
+ assertThat(errorMarkers).as("error markers in " + project).isEmpty();
TestLaunchShortcut launchShortcut = new TestLaunchShortcut();
ILaunchConfigurationWorkingCopy launchConfiguration = launchShortcut.createLaunchConfiguration(element);
diff --git a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
index 9f74b93..ce2dfc4 100644
--- a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@
org.eclipse.debug.core,
org.eclipse.pde.genericeditor.extension,
org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="2.1.300",
- org.hamcrest.library;bundle-version="1.3.0"
+ org.assertj;bundle-version="3.14.0"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-BundleShape: dir
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/DynamicPluginProjectReferencesTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/DynamicPluginProjectReferencesTest.java
index 7ac49aa..436a966 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/DynamicPluginProjectReferencesTest.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/project/DynamicPluginProjectReferencesTest.java
@@ -13,9 +13,8 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.project;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.emptyArray;
-import static org.hamcrest.Matchers.is;
+
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.util.Arrays;
@@ -52,7 +51,7 @@
ProjectUtils.importTestProject("tests/projects/host-fragment-" + type + "/testframework");
IBuildConfiguration[] referenced = host.getReferencedBuildConfigs(host.getActiveBuildConfig().getName(), false);
- assertThat(referenced, is(emptyArray()));
+ assertThat(referenced).isEmpty();
}
@Test
@@ -110,7 +109,7 @@
IBuildConfiguration[] referenced = consumer.getReferencedBuildConfigs(consumer.getActiveBuildConfig().getName(),
false);
- assertThat(referenced, is(emptyArray()));
+ assertThat(referenced).isEmpty();
}
}
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetPlatformTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetPlatformTests.java
index e5f49ab..d0edae9 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetPlatformTests.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetPlatformTests.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.pde.ui.tests.target;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
@@ -64,7 +65,7 @@
private void checkPlatformXML(File location, IPluginModelBase[] plugins) throws Exception {
File parent = new File(location, "org.eclipse.update");
File platform_xml = new File(parent, "platform.xml");
- assertTrue(platform_xml.exists());
+ assertThat(platform_xml).exists();
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document document = builder.parse(platform_xml);
assertEquals("1.0", document.getXmlVersion());
@@ -74,7 +75,7 @@
assertEquals("true", config.getAttribute("transient"));
assertEquals("3.0", config.getAttribute("version"));
Date date = new Date(Long.parseLong(config.getAttribute("date")));
- assertTrue(date.before(new Date()));
+ assertThat(date).isBefore(new Date());
NodeList sites = config.getElementsByTagName("site");
if (plugins.length == 0) {
assertEquals(0, sites.getLength());
@@ -87,7 +88,7 @@
assertEquals("true", node.getAttribute("enabled"));
assertTrueIfNotEmpty(node.getAttribute("updatable"));
assertEquals("USER-INCLUDE", node.getAttribute("policy"));
- assertTrue(node.getAttribute("url").startsWith("file:/"));
+ assertThat(node.getAttribute("url")).startsWith("file:/");
assertNotNull(node.getAttribute("list"));
assertTrue(hasNoChildren(node));
String[] list = node.getAttribute("list").split(",");
@@ -104,7 +105,7 @@
Element node = (Element) features.item(i);
assertTrueIfNotEmpty(node.getAttribute("enabled"));
String url = node.getAttribute("url");
- assertTrue(url.startsWith("features"));
+ assertThat(url).startsWith("features");
Matcher matcher = featurePattern.matcher(url);
if (matcher.matches()) {
// Relies on naming convention feature/id_version
