Skip to content
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.

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

Expose ComparisonStrategy::areEqual in AbstractAssert #2633

Merged
merged 1 commit into from May 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/main/java/org/assertj/core/api/AbstractAssert.java
Expand Up @@ -42,6 +42,7 @@
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.error.MessageFormatter;
import org.assertj.core.internal.ComparatorBasedComparisonStrategy;
import org.assertj.core.internal.ComparisonStrategy;
import org.assertj.core.internal.Conditions;
import org.assertj.core.internal.Failures;
import org.assertj.core.internal.Objects;
Expand Down Expand Up @@ -1118,4 +1119,20 @@ protected RecursiveComparisonAssert<?> usingRecursiveComparison() {
return (ASSERT) assertFactory.createAssert(extractedValue).withAssertionState(myself);
}

/**
* Returns true if actual and other are equal according to the current comparison strategy.
*
* @param actual the object to compare to other
* @param other the object to compare to actual
* @return true if actual and other are equal according to the underlying comparison strategy.
* @since 3.23.0
*
* @deprecated {@link ComparisonStrategy} will become part of the public API in the next major release and this method
* will be removed.
*/
@Deprecated
protected boolean areEqual(Object actual, Object other) {
return objects.getComparisonStrategy().areEqual(actual, other);
}

}
@@ -0,0 +1,59 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*
* Copyright 2012-2022 the original author or authors.
*/
package org.assertj.core.api;
scordio marked this conversation as resolved.
Show resolved Hide resolved

import static org.assertj.core.api.BDDAssertions.then;
import static org.mockito.Answers.CALLS_REAL_METHODS;
import static org.mockito.Mockito.verify;

import java.lang.reflect.Method;
import java.lang.reflect.Modifier;

import org.assertj.core.internal.ComparisonStrategy;
import org.assertj.core.internal.Objects;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class AbstractAssert_areEqual_Test {

@Mock(answer = CALLS_REAL_METHODS)
private AbstractAssert<?, Object> underTest;

@Mock
private ComparisonStrategy comparisonStrategy;

@Test
@SuppressWarnings("deprecation")
void should_delegate_to_ComparableAssert() {
// GIVEN
underTest.objects = new Objects(comparisonStrategy);
// WHEN
underTest.areEqual(42, 43);
// THEN
verify(comparisonStrategy).areEqual(42, 43);
}

@Test
void should_be_protected() throws NoSuchMethodException {
// GIVEN
Method areEqual = underTest.getClass().getDeclaredMethod("areEqual", Object.class, Object.class);
// WHEN
boolean isProtected = Modifier.isProtected(areEqual.getModifiers());
// THEN
then(isProtected).isTrue();
Comment on lines +51 to +56
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assertThat(underTest.getClass())
  .getDeclaredMethod("areEqual", Object.class, Object.class)
  .isProtected();

How much nicer would it be? 🙂

}

}