Skip to content

Commit

Permalink
assertEqual -> assertEquals and assertNotEqual->assertNotEquals
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlink
jlink committed Oct 28, 2015
1 parent fcfd3cb commit b56efab
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
22 changes: 11 additions & 11 deletions junit5-api/src/main/java/org/junit/gen5/api/Assertions.java
View file
@@ -1,12 +1,12 @@
package org.junit.gen5.api; package org.junit.gen5.api;


import org.junit.gen5.commons.util.ObjectUtils;
import org.opentestalliance.AssertionFailedError;

import java.util.Objects; import java.util.Objects;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import java.util.function.Supplier; import java.util.function.Supplier;


import org.junit.gen5.commons.util.ObjectUtils;
import org.opentestalliance.AssertionFailedError;

/** /**
* @author JUnit Community * @author JUnit Community
* @author Sam Brannen * @author Sam Brannen
Expand Down Expand Up @@ -125,33 +125,33 @@ public static void assertNotNull(Object actual, Supplier<String> messageSupplier
} }
} }


public static void assertEqual(Object expected, Object actual) { public static void assertEquals(Object expected, Object actual) {
assertEqual(expected, actual, (String) null); assertEquals(expected, actual, (String) null);
} }


public static void assertEqual(Object expected, Object actual, String message) { public static void assertEquals(Object expected, Object actual, String message) {
if (!Objects.equals(expected, actual)) { if (!Objects.equals(expected, actual)) {
failNotEqual(expected, actual, message); failNotEqual(expected, actual, message);
} }
} }


public static void assertEqual(Object expected, Object actual, Supplier<String> messageSupplier) { public static void assertEquals(Object expected, Object actual, Supplier<String> messageSupplier) {
if (!Objects.equals(expected, actual)) { if (!Objects.equals(expected, actual)) {
failNotEqual(expected, actual, nullSafeGet(messageSupplier)); failNotEqual(expected, actual, nullSafeGet(messageSupplier));
} }
} }


public static void assertNotEqual(Object unexpected, Object actual) { public static void assertNotEquals(Object unexpected, Object actual) {
assertNotEqual(unexpected, actual, (String) null); assertNotEquals(unexpected, actual, (String) null);
} }


public static void assertNotEqual(Object unexpected, Object actual, String message) { public static void assertNotEquals(Object unexpected, Object actual, String message) {
if (Objects.equals(unexpected, actual)) { if (Objects.equals(unexpected, actual)) {
failEqual(actual, message); failEqual(actual, message);
} }
} }


public static void assertNotEqual(Object unexpected, Object actual, Supplier<String> messageSupplier) { public static void assertNotEquals(Object unexpected, Object actual, Supplier<String> messageSupplier) {
if (Objects.equals(unexpected, actual)) { if (Objects.equals(unexpected, actual)) {
failEqual(actual, nullSafeGet(messageSupplier)); failEqual(actual, nullSafeGet(messageSupplier));
} }
Expand Down
44 changes: 22 additions & 22 deletions junit5-engine/src/test/java/org/junit/gen5/engine/junit5/JavaTestDescriptorTests.java
View file
Expand Up @@ -32,12 +32,12 @@ public void constructFromMethod() throws Exception {
JavaTestDescriptor descriptor = new JavaTestDescriptor(JUNIT_5_ENGINE_ID, testMethod); JavaTestDescriptor descriptor = new JavaTestDescriptor(JUNIT_5_ENGINE_ID, testMethod);


System.out.println("DEBUG - " + descriptor); System.out.println("DEBUG - " + descriptor);
assertEqual(JUNIT_5_ENGINE_ID, descriptor.getEngineId()); assertEquals(JUNIT_5_ENGINE_ID, descriptor.getEngineId());
assertEqual(TEST_METHOD_ID, descriptor.getTestId()); assertEquals(TEST_METHOD_ID, descriptor.getTestId());
assertEqual(TEST_METHOD_UID, descriptor.getUniqueId()); assertEquals(TEST_METHOD_UID, descriptor.getUniqueId());
assertEqual(getClass(), descriptor.getTestClass()); assertEquals(getClass(), descriptor.getTestClass());
assertEqual(testMethod, descriptor.getTestMethod()); assertEquals(testMethod, descriptor.getTestMethod());
assertEqual("test", descriptor.getDisplayName(), "display name:"); assertEquals("test", descriptor.getDisplayName(), "display name:");
} }


@org.junit.Test @org.junit.Test
Expand All @@ -46,10 +46,10 @@ public void constructFromMethodWithCustomDisplayName() throws Exception {
JavaTestDescriptor descriptor = new JavaTestDescriptor(JUNIT_5_ENGINE_ID, testMethod); JavaTestDescriptor descriptor = new JavaTestDescriptor(JUNIT_5_ENGINE_ID, testMethod);


System.out.println("DEBUG - " + descriptor); System.out.println("DEBUG - " + descriptor);
assertEqual(JUNIT_5_ENGINE_ID, descriptor.getEngineId()); assertEquals(JUNIT_5_ENGINE_ID, descriptor.getEngineId());
assertEqual(getClass(), descriptor.getTestClass()); assertEquals(getClass(), descriptor.getTestClass());
assertEqual(testMethod, descriptor.getTestMethod()); assertEquals(testMethod, descriptor.getTestMethod());
assertEqual("custom test name", descriptor.getDisplayName(), "display name:"); assertEquals("custom test name", descriptor.getDisplayName(), "display name:");
} }


@org.junit.Test @org.junit.Test
Expand All @@ -58,30 +58,30 @@ public void constructFromMethodWithParameters() throws Exception {
JavaTestDescriptor descriptor = new JavaTestDescriptor(JUNIT_5_ENGINE_ID, testMethod); JavaTestDescriptor descriptor = new JavaTestDescriptor(JUNIT_5_ENGINE_ID, testMethod);


System.out.println("DEBUG - " + descriptor); System.out.println("DEBUG - " + descriptor);
assertEqual(JUNIT_5_ENGINE_ID, descriptor.getEngineId()); assertEquals(JUNIT_5_ENGINE_ID, descriptor.getEngineId());
assertEqual(TEST_METHOD_STRING_BIGDECIMAL_ID, descriptor.getTestId()); assertEquals(TEST_METHOD_STRING_BIGDECIMAL_ID, descriptor.getTestId());
assertEqual(TEST_METHOD_STRING_BIGDECIMAL_UID, descriptor.getUniqueId()); assertEquals(TEST_METHOD_STRING_BIGDECIMAL_UID, descriptor.getUniqueId());
assertEqual(getClass(), descriptor.getTestClass()); assertEquals(getClass(), descriptor.getTestClass());
assertEqual(testMethod, descriptor.getTestMethod()); assertEquals(testMethod, descriptor.getTestMethod());
assertEqual("test", descriptor.getDisplayName(), "display name:"); assertEquals("test", descriptor.getDisplayName(), "display name:");
} }


@org.junit.Test @org.junit.Test
public void fromTestDescriptorIdForMethod() throws Exception { public void fromTestDescriptorIdForMethod() throws Exception {
JavaTestDescriptor descriptor = JavaTestDescriptor.from(TEST_METHOD_UID); JavaTestDescriptor descriptor = JavaTestDescriptor.from(TEST_METHOD_UID);
assertNotNull(descriptor, "descriptor:"); assertNotNull(descriptor, "descriptor:");
assertEqual("test", descriptor.getDisplayName(), "display name:"); assertEquals("test", descriptor.getDisplayName(), "display name:");
assertEqual(JavaTestDescriptorTests.class, descriptor.getTestClass()); assertEquals(JavaTestDescriptorTests.class, descriptor.getTestClass());
assertEqual(JavaTestDescriptorTests.class.getDeclaredMethod("test"), descriptor.getTestMethod()); assertEquals(JavaTestDescriptorTests.class.getDeclaredMethod("test"), descriptor.getTestMethod());
} }


@org.junit.Test @org.junit.Test
public void fromTestDescriptorIdForMethodWithParameters() throws Exception { public void fromTestDescriptorIdForMethodWithParameters() throws Exception {
JavaTestDescriptor descriptor = JavaTestDescriptor.from(TEST_METHOD_STRING_BIGDECIMAL_UID); JavaTestDescriptor descriptor = JavaTestDescriptor.from(TEST_METHOD_STRING_BIGDECIMAL_UID);
assertNotNull(descriptor, "descriptor:"); assertNotNull(descriptor, "descriptor:");
assertEqual("test", descriptor.getDisplayName(), "display name:"); assertEquals("test", descriptor.getDisplayName(), "display name:");
assertEqual(getClass(), descriptor.getTestClass()); assertEquals(getClass(), descriptor.getTestClass());
assertEqual(getClass().getDeclaredMethod("test", String.class, BigDecimal.class), descriptor.getTestMethod()); assertEquals(getClass().getDeclaredMethod("test", String.class, BigDecimal.class), descriptor.getTestMethod());
} }




Expand Down

0 comments on commit b56efab

Please sign in to comment.