Merge 9109896 into 78e6808

eXparity · Mar 16, 2018 · 2afd08d · 2afd08d
2 parents 78e6808 + 9109896
commit 2afd08d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/src/main/java/org/exparity/hamcrest/beans/TheSameAs.java b/src/main/java/org/exparity/hamcrest/beans/TheSameAs.java
@@ -550,6 +550,8 @@ private void compareObjects(final Object expected, final Object actual, final St
 		final Type type = type(klass, new CapitalizedNamingStrategy());
 		if (type.isArray()) {
 			compareArrays(expected, actual, path, ctx);
+		} else if (type.isEnum()) {
+			compareEnums(expected, actual, path, ctx);
 		} else if (type.packageName().startsWith("java.lang")) {
 			compareLangTypes(expected, actual, path, ctx);
 		} else if (type.is(List.class)) {
@@ -601,6 +603,14 @@ private void compareArrays(final Object expected, final Object actual, final Str
 		}
 	}
 
+	private void compareEnums(final Object expected, final Object actual, final String path,
+							  final MismatchContext ctx) {
+		LOG.debug("Compare path [{}] as enum", path);
+		if (actual != expected) {
+			ctx.addMismatch(expected, actual, path);
+		}
+	}
+
 	private void compareLangTypes(final Object expected, final Object actual, final String path,
 			final MismatchContext ctx) {
 		LOG.debug("Compare path [{}] as lang type", path);

diff --git a/src/test/java/org/exparity/hamcrest/beans/TheSameAsTest.java b/src/test/java/org/exparity/hamcrest/beans/TheSameAsTest.java
@@ -16,13 +16,7 @@
 import org.exparity.hamcrest.BeanMatchers;
 import org.exparity.hamcrest.beans.TheSameAs.PropertyComparator;
 import org.exparity.hamcrest.beans.comparators.HasPattern;
-import org.exparity.hamcrest.beans.testutils.types.ClassContainingNestedClasses;
-import org.exparity.hamcrest.beans.testutils.types.NotBean;
-import org.exparity.hamcrest.beans.testutils.types.ObjectWithAllTypes;
-import org.exparity.hamcrest.beans.testutils.types.OuterClass;
-import org.exparity.hamcrest.beans.testutils.types.SimpleType;
-import org.exparity.hamcrest.beans.testutils.types.SimpleTypeWithList;
-import org.exparity.hamcrest.beans.testutils.types.SimpleTypeWithSimpleType;
+import org.exparity.hamcrest.beans.testutils.types.*;
 import org.testng.annotations.Test;
 
 /**
@@ -517,4 +511,18 @@ public void canTestNestedNullObjects() {
 		assertThat(actual, theSameAs(reference));
 	}
 
+	@Test
+	public void canCompareSameEnumValues() {
+		final SimpleEnum reference = SimpleEnum.VALUE_A;
+		final SimpleEnum actual = SimpleEnum.VALUE_A;
+		assertThat(actual, theSameAs(reference));
+	}
+
+	@Test(expectedExceptions = AssertionError.class)
+	public void canCompareDifferentEnumValues() {
+		final SimpleEnum reference = SimpleEnum.VALUE_A;
+		final SimpleEnum actual = SimpleEnum.VALUE_B;
+		assertThat(actual, theSameAs(reference));
+	}
+
 }
diff --git a/src/test/java/org/exparity/hamcrest/beans/testutils/types/SimpleEnum.java b/src/test/java/org/exparity/hamcrest/beans/testutils/types/SimpleEnum.java
@@ -0,0 +1,5 @@
+package org.exparity.hamcrest.beans.testutils.types;
+
+public enum SimpleEnum {
+    VALUE_A, VALUE_B
+}