Repository: qpid-jms Updated Branches: refs/heads/master 03be3ff08 -> 381f2397e
add equals+hashcode to testpeer outcome described types Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/d7ea4b17 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d7ea4b17 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d7ea4b17 Branch: refs/heads/master Commit: d7ea4b175b4a22151e430dab102c3ffd2675c952 Parents: 03be3ff Author: Robert Gemmell <[email protected]> Authored: Wed Nov 19 15:20:08 2014 +0000 Committer: Robert Gemmell <[email protected]> Committed: Wed Nov 19 15:20:08 2014 +0000 ---------------------------------------------------------------------- .../test/testpeer/describedtypes/Accepted.java | 38 ++++++++++++++++++++ .../test/testpeer/describedtypes/Declared.java | 38 ++++++++++++++++++++ .../test/testpeer/describedtypes/Modified.java | 38 ++++++++++++++++++++ .../test/testpeer/describedtypes/Rejected.java | 38 ++++++++++++++++++++ .../test/testpeer/describedtypes/Released.java | 38 ++++++++++++++++++++ .../describedtypes/generate-described-types.xsl | 4 +-- 6 files changed, 192 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d7ea4b17/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java index cf3e2ea..7044a0f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java @@ -21,6 +21,7 @@ package org.apache.qpid.jms.test.testpeer.describedtypes; import org.apache.qpid.jms.test.testpeer.ListDescribedType; +import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -50,5 +51,42 @@ public class Accepted extends ListDescribedType return DESCRIPTOR_SYMBOL; } + @Override + public boolean equals(Object obj) + { + if(obj == this) + { + return true; + } + + if(!(obj instanceof DescribedType)) + { + return false; + } + + DescribedType d = (DescribedType) obj; + if(!(DESCRIPTOR_CODE.equals(d.getDescriptor()) || DESCRIPTOR_SYMBOL.equals(d.getDescriptor()))) + { + return false; + } + + Object described = getDescribed(); + Object described2 = d.getDescribed(); + if(described == null) + { + return described2 == null; + } + else { + return described.equals(described2); + } + } + + @Override + public int hashCode() + { + //This is a hack, but we aren't going to hash lots of these test objects. + return 1; + } + } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d7ea4b17/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Declared.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Declared.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Declared.java index 9f0b389..95bb1ec 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Declared.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Declared.java @@ -21,6 +21,7 @@ package org.apache.qpid.jms.test.testpeer.describedtypes; import org.apache.qpid.jms.test.testpeer.ListDescribedType; +import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -57,5 +58,42 @@ public class Declared extends ListDescribedType return this; } + @Override + public boolean equals(Object obj) + { + if(obj == this) + { + return true; + } + + if(!(obj instanceof DescribedType)) + { + return false; + } + + DescribedType d = (DescribedType) obj; + if(!(DESCRIPTOR_CODE.equals(d.getDescriptor()) || DESCRIPTOR_SYMBOL.equals(d.getDescriptor()))) + { + return false; + } + + Object described = getDescribed(); + Object described2 = d.getDescribed(); + if(described == null) + { + return described2 == null; + } + else { + return described.equals(described2); + } + } + + @Override + public int hashCode() + { + //This is a hack, but we aren't going to hash lots of these test objects. + return 1; + } + } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d7ea4b17/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java index ac2d7d1..267f36f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java @@ -21,6 +21,7 @@ package org.apache.qpid.jms.test.testpeer.describedtypes; import org.apache.qpid.jms.test.testpeer.ListDescribedType; +import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -71,5 +72,42 @@ public class Modified extends ListDescribedType return this; } + @Override + public boolean equals(Object obj) + { + if(obj == this) + { + return true; + } + + if(!(obj instanceof DescribedType)) + { + return false; + } + + DescribedType d = (DescribedType) obj; + if(!(DESCRIPTOR_CODE.equals(d.getDescriptor()) || DESCRIPTOR_SYMBOL.equals(d.getDescriptor()))) + { + return false; + } + + Object described = getDescribed(); + Object described2 = d.getDescribed(); + if(described == null) + { + return described2 == null; + } + else { + return described.equals(described2); + } + } + + @Override + public int hashCode() + { + //This is a hack, but we aren't going to hash lots of these test objects. + return 1; + } + } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d7ea4b17/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java index 4e08b4a..9faf985 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java @@ -21,6 +21,7 @@ package org.apache.qpid.jms.test.testpeer.describedtypes; import org.apache.qpid.jms.test.testpeer.ListDescribedType; +import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -57,5 +58,42 @@ public class Rejected extends ListDescribedType return this; } + @Override + public boolean equals(Object obj) + { + if(obj == this) + { + return true; + } + + if(!(obj instanceof DescribedType)) + { + return false; + } + + DescribedType d = (DescribedType) obj; + if(!(DESCRIPTOR_CODE.equals(d.getDescriptor()) || DESCRIPTOR_SYMBOL.equals(d.getDescriptor()))) + { + return false; + } + + Object described = getDescribed(); + Object described2 = d.getDescribed(); + if(described == null) + { + return described2 == null; + } + else { + return described.equals(described2); + } + } + + @Override + public int hashCode() + { + //This is a hack, but we aren't going to hash lots of these test objects. + return 1; + } + } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d7ea4b17/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java index e355ecb..df15e74 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java @@ -21,6 +21,7 @@ package org.apache.qpid.jms.test.testpeer.describedtypes; import org.apache.qpid.jms.test.testpeer.ListDescribedType; +import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -50,5 +51,42 @@ public class Released extends ListDescribedType return DESCRIPTOR_SYMBOL; } + @Override + public boolean equals(Object obj) + { + if(obj == this) + { + return true; + } + + if(!(obj instanceof DescribedType)) + { + return false; + } + + DescribedType d = (DescribedType) obj; + if(!(DESCRIPTOR_CODE.equals(d.getDescriptor()) || DESCRIPTOR_SYMBOL.equals(d.getDescriptor()))) + { + return false; + } + + Object described = getDescribed(); + Object described2 = d.getDescribed(); + if(described == null) + { + return described2 == null; + } + else { + return described.equals(described2); + } + } + + @Override + public int hashCode() + { + //This is a hack, but we aren't going to hash lots of these test objects. + return 1; + } + } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d7ea4b17/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-described-types.xsl ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-described-types.xsl b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-described-types.xsl index 502e1d0..82157f7 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-described-types.xsl +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-described-types.xsl @@ -61,7 +61,7 @@ <xsl:value-of select="$license"/> package org.apache.qpid.jms.test.testpeer.describedtypes; -import org.apache.qpid.jms.test.testpeer.ListDescribedType;<xsl:if test="@name = 'declare' or @name = 'discharge'"> +import org.apache.qpid.jms.test.testpeer.ListDescribedType;<xsl:if test="@name = 'declare' or @name = 'discharge' or @provides = 'delivery-state, outcome'"> import org.apache.qpid.proton.amqp.DescribedType;</xsl:if> import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -99,7 +99,7 @@ public class <xsl:value-of select="$classname"/> extends ListDescribedType return this; } </xsl:for-each> -<xsl:if test="@name = 'declare' or @name = 'discharge'"> +<xsl:if test="@name = 'declare' or @name = 'discharge' or @provides = 'delivery-state, outcome'"> @Override public boolean equals(Object obj) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
