From 1ad39860c763148914c29f525c8fabf7131fa4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 29 May 2015 22:20:44 +0300 Subject: [PATCH] Change equals contract --- src/main/java/com/mysema/codegen/model/Parameter.java | 4 ++-- src/test/java/com/mysema/codegen/model/ParameterTest.java | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/mysema/codegen/model/Parameter.java b/src/main/java/com/mysema/codegen/model/Parameter.java index 40403039e..cf73779b2 100644 --- a/src/main/java/com/mysema/codegen/model/Parameter.java +++ b/src/main/java/com/mysema/codegen/model/Parameter.java @@ -17,7 +17,6 @@ package com.mysema.codegen.model; * Parameter represents a parameter in a Constructor * * @author tiwe - * @version $Id$ */ public final class Parameter { @@ -35,7 +34,8 @@ public final class Parameter { if (o == this) { return true; } else if (o instanceof Parameter) { - return type.equals(((Parameter) o).type); + Parameter t = (Parameter) o; + return type.equals(t.type) && name.equals(t.name); } else { return false; } diff --git a/src/test/java/com/mysema/codegen/model/ParameterTest.java b/src/test/java/com/mysema/codegen/model/ParameterTest.java index 0997388f1..7e1279b20 100644 --- a/src/test/java/com/mysema/codegen/model/ParameterTest.java +++ b/src/test/java/com/mysema/codegen/model/ParameterTest.java @@ -6,14 +6,9 @@ package com.mysema.codegen.model; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.mysema.codegen.model.ClassType; -import com.mysema.codegen.model.Parameter; -import com.mysema.codegen.model.TypeCategory; - public class ParameterTest { @Test @@ -23,8 +18,9 @@ public class ParameterTest { Parameter param3 = new Parameter("test2", new ClassType(TypeCategory.NUMERIC, Integer.class)); - assertTrue(param1.equals(param2)); + assertFalse(param1.equals(param2)); assertFalse(param1.equals(param3)); assertFalse(param2.equals(param3)); } + }