Skip to content

Replace Hamcrest matcher in resource tests with AssertJ assertion #2382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeikoKlare merged 1 commit into from
Jan 3, 2026
+36 −58
Merged

Replace Hamcrest matcher in resource tests with AssertJ assertion #2382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 36 additions & 58 deletions ...clipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectEncodingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
import static org.eclipse.core.tests.resources.ResourceTestUtil.waitForBuild;
import static org.hamcrest.MatcherAssert.assertThat;

import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.SoftAssertions;
import org.eclipse.core.internal.resources.PreferenceInitializer;
import org.eclipse.core.internal.resources.ValidateProjectEncoding;
import org.eclipse.core.internal.utils.Messages;
Expand All @@ -33,9 +35,6 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.core.tests.resources.util.WorkspaceResetExtension;
import org.eclipse.osgi.util.NLS;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.DiagnosingMatcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -185,60 +184,39 @@ private void thenProjectHasNoEncodingMarker() throws Exception {
}

private void thenProjectHasEncodingMarkerOfSeverity(int expectedSeverity) throws Exception {
assertThat(project, hasEncodingMarkerOfSeverity(expectedSeverity));
}

private BaseMatcher<IProject> hasEncodingMarkerOfSeverity(final int expectedSeverity) {
return new DiagnosingMatcher<>() {

@Override
public boolean matches(Object item, Description mismatchDescription) {
IProject theProject = (IProject) item;

try {
IMarker[] markers = theProject.findMarkers(ValidateProjectEncoding.MARKER_TYPE, false,
IResource.DEPTH_ONE);
if (markers.length == 1) {
IMarker marker = markers[0];
String[] attributeNames = { IMarker.MESSAGE, IMarker.SEVERITY, IMarker.LOCATION };
Object[] values = marker.getAttributes(attributeNames);

boolean msgOk = getExpectedMarkerMessage().equals(values[0]);
boolean sevOk = ((Integer) expectedSeverity).equals(values[1]);
boolean locOk = project.getFullPath().toString().equals(values[2]);

if (!msgOk) {
mismatchDescription.appendText("\n has marker message: " + values[0]);
}
if (!sevOk) {
mismatchDescription.appendText("\n has marker severity: " + values[1]);
}
if (!locOk) {
mismatchDescription.appendText("\n has marker location: " + values[2]);
}

return msgOk && sevOk && locOk;
}
mismatchDescription.appendText("\n has " + markers.length + " encoding markers");

} catch (CoreException e) {
mismatchDescription.appendText("\n cannot access markers: " + e.getMessage());
}
return false;
}

@Override
public void describeTo(Description description) {
description.appendText("\n has marker of message: '" + getExpectedMarkerMessage() + "'");
description.appendText("\n has marker severity: " + expectedSeverity);
description.appendText("\n has location: <path of the project>");
}

private String getExpectedMarkerMessage() {
return NLS.bind(Messages.resources_checkExplicitEncoding_problemText, project.getName());
}

};
IProjectMatcher.assertThat(project).hasEncodingMarkerOfSeverity(expectedSeverity);
}

private static class IProjectMatcher extends AbstractAssert<IProjectMatcher, IProject> {

private IProjectMatcher(IProject actual) {
super(actual, IProjectMatcher.class);
}

public static IProjectMatcher assertThat(IProject project) {
return new IProjectMatcher(project);
}

public void hasEncodingMarkerOfSeverity(int expectedSeverity) throws CoreException {
isNotNull();

IMarker[] markers = actual.findMarkers(ValidateProjectEncoding.MARKER_TYPE, false, IResource.DEPTH_ONE);
Assertions.assertThat(markers).hasSize(1).allSatisfy(marker -> {
String[] attributeNames = { IMarker.MESSAGE, IMarker.SEVERITY, IMarker.LOCATION };
Object[] values = marker.getAttributes(attributeNames);

SoftAssertions softAssert = new SoftAssertions();
softAssert.assertThat(values[0]).as("marker message").isEqualTo(getExpectedMarkerMessage());
softAssert.assertThat(values[1]).as("marker severity").isEqualTo(expectedSeverity);
softAssert.assertThat(values[2]).as("marker location").isEqualTo(actual.getFullPath().toString());
softAssert.assertAll();
});
}

private String getExpectedMarkerMessage() {
return NLS.bind(Messages.resources_checkExplicitEncoding_problemText, actual.getName());
}

}

private void buildAndWaitForBuildFinish() {
Expand Down
Loading