You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by no...@apache.org on 2012/11/08 14:05:44 UTC
svn commit: r1407041 [2/2] - in
/directmemory/lightning/trunk/lightning-core/src:
main/java/org/apache/directmemory/lightning/internal/
main/java/org/apache/directmemory/lightning/internal/beans/
main/java/org/apache/directmemory/lightning/internal/ins...
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -194,19 +194,29 @@ public class MapMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
NoGenericTypeMap other = (NoGenericTypeMap) obj;
if ( map == null )
{
if ( other.map != null )
+ {
return false;
+ }
}
else if ( !map.equals( other.map ) )
+ {
return false;
+ }
return true;
}
@@ -246,19 +256,29 @@ public class MapMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
SimpleGenericTypeMap other = (SimpleGenericTypeMap) obj;
if ( map == null )
{
if ( other.map != null )
+ {
return false;
+ }
}
else if ( !map.equals( other.map ) )
+ {
return false;
+ }
return true;
}
@@ -298,19 +318,29 @@ public class MapMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ComplexGenericTypeSet other = (ComplexGenericTypeSet) obj;
if ( set == null )
{
if ( other.set != null )
+ {
return false;
+ }
}
else if ( !set.equals( other.set ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -193,19 +193,29 @@ public class SetMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
NoGenericTypeSet other = (NoGenericTypeSet) obj;
if ( set == null )
{
if ( other.set != null )
+ {
return false;
+ }
}
else if ( !set.equals( other.set ) )
+ {
return false;
+ }
return true;
}
@@ -245,19 +255,29 @@ public class SetMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
SimpleGenericTypeSet other = (SimpleGenericTypeSet) obj;
if ( set == null )
{
if ( other.set != null )
+ {
return false;
+ }
}
else if ( !set.equals( other.set ) )
+ {
return false;
+ }
return true;
}
@@ -297,19 +317,29 @@ public class SetMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
ComplexGenericTypeSet other = (ComplexGenericTypeSet) obj;
if ( set == null )
{
if ( other.set != null )
+ {
return false;
+ }
}
else if ( !set.equals( other.set ) )
+ {
return false;
+ }
return true;
}
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java?rev=1407041&r1=1407040&r2=1407041&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java Thu Nov 8 13:05:42 2012
@@ -192,16 +192,26 @@ public class ShortMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
PrimitiveHolder other = (PrimitiveHolder) obj;
if ( value1 != other.value1 )
+ {
return false;
+ }
if ( value2 != other.value2 )
+ {
return false;
+ }
return true;
}
@@ -269,33 +279,51 @@ public class ShortMarshallerTestCase
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
WrapperHolder other = (WrapperHolder) obj;
if ( value1 == null )
{
if ( other.value1 != null )
+ {
return false;
+ }
}
else if ( !value1.equals( other.value1 ) )
+ {
return false;
+ }
if ( value2 == null )
{
if ( other.value2 != null )
+ {
return false;
+ }
}
else if ( !value2.equals( other.value2 ) )
+ {
return false;
+ }
if ( value3 == null )
{
if ( other.value3 != null )
+ {
return false;
+ }
}
else if ( !value3.equals( other.value3 ) )
+ {
return false;
+ }
return true;
}