Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit b3f51f9

Browse files
committed
Merge pull request #26 from querydsl/i12
Change equals contract
2 parents 9c155ba + 1ad3986 commit b3f51f9

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/main/java/com/mysema/codegen/model/Parameter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* Parameter represents a parameter in a Constructor
1818
*
1919
* @author tiwe
20-
* @version $Id$
2120
*/
2221
public final class Parameter {
2322

@@ -35,7 +34,8 @@ public boolean equals(Object o) {
3534
if (o == this) {
3635
return true;
3736
} else if (o instanceof Parameter) {
38-
return type.equals(((Parameter) o).type);
37+
Parameter t = (Parameter) o;
38+
return type.equals(t.type) && name.equals(t.name);
3939
} else {
4040
return false;
4141
}

src/test/java/com/mysema/codegen/model/ParameterTest.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@
66
package com.mysema.codegen.model;
77

88
import static org.junit.Assert.assertFalse;
9-
import static org.junit.Assert.assertTrue;
109

1110
import org.junit.Test;
1211

13-
import com.mysema.codegen.model.ClassType;
14-
import com.mysema.codegen.model.Parameter;
15-
import com.mysema.codegen.model.TypeCategory;
16-
1712
public class ParameterTest {
1813

1914
@Test
@@ -23,8 +18,9 @@ public void test() {
2318
Parameter param3 = new Parameter("test2",
2419
new ClassType(TypeCategory.NUMERIC, Integer.class));
2520

26-
assertTrue(param1.equals(param2));
21+
assertFalse(param1.equals(param2));
2722
assertFalse(param1.equals(param3));
2823
assertFalse(param2.equals(param3));
2924
}
25+
3026
}

0 commit comments

Comments
 (0)