Added more PrefixSearchRule tests

1 files changed, 4 insertions, 18 deletions

diff --git a/src/main/java/sevenUnitsGUI/PrefixSearchRule.java b/src/main/java/sevenUnitsGUI/PrefixSearchRule.java
index a62ccda..a5034c9 100644
--- a/src/main/java/sevenUnitsGUI/PrefixSearchRule.java
+++ b/src/main/java/sevenUnitsGUI/PrefixSearchRule.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -136,17 +137,8 @@ public final class PrefixSearchRule implements
 		if (!(obj instanceof PrefixSearchRule))
 			return false;
 		final PrefixSearchRule other = (PrefixSearchRule) obj;
-		if (this.prefixableUnitRule == null) {
-			if (other.prefixableUnitRule != null)
-				return false;
-		} else if (!this.prefixableUnitRule.equals(other.prefixableUnitRule))
-			return false;
-		if (this.prefixes == null) {
-			if (other.prefixes != null)
-				return false;
-		} else if (!this.prefixes.equals(other.prefixes))
-			return false;
-		return true;
+		return Objects.equals(this.prefixableUnitRule, other.prefixableUnitRule)
+				&& Objects.equals(this.prefixes, other.prefixes);
 	}
 	
 	/**
@@ -169,13 +161,7 @@ public final class PrefixSearchRule implements
 	
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + (this.prefixableUnitRule == null ? 0
-				: this.prefixableUnitRule.hashCode());
-		result = prime * result
-				+ (this.prefixes == null ? 0 : this.prefixes.hashCode());
-		return result;
+		return Objects.hash(this.prefixableUnitRule, this.prefixes);
 	}
 	
 	@Override