Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

equals doesn't check null

This commit is contained in:
Adrian Cole 2013-01-12 08:01:31 -08:00
parent 21f6431f50
commit 2f5e38d237
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/test/java/org/jclouds/internal/BaseViewTest.java
View File

@ -19,7 +19,6 @@
package org.jclouds.internal; package org.jclouds.internal;
import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.fail; import static org.testng.Assert.fail;
@ -29,7 +28,6 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.rest.Utils; import org.jclouds.rest.Utils;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Objects;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
/** /**
@ -44,14 +42,8 @@ public class BaseViewTest {
super("water", createMock(ProviderMetadata.class), "identity", createMock(Utils.class), createMock(Closer.class)); super("water", createMock(ProviderMetadata.class), "identity", createMock(Utils.class), createMock(Closer.class));
} }
@Override
public void close() { public void close() {
} }
@Override
public boolean equals(Object in){
return Objects.equal(in.getClass(), getClass());
}
} }
private static class PeanutButter extends ContextImpl { private static class PeanutButter extends ContextImpl {
@ -60,14 +52,8 @@ public class BaseViewTest {
super("peanutbutter", createMock(ProviderMetadata.class), "identity", createMock(Utils.class), createMock(Closer.class)); super("peanutbutter", createMock(ProviderMetadata.class), "identity", createMock(Utils.class), createMock(Closer.class));
} }
@Override
public void close() { public void close() {
} }
@Override
public boolean equals(Object in){
return Objects.equal(in.getClass(), getClass());
}
} }
private static class Wine extends BaseView { private static class Wine extends BaseView {
@ -80,8 +66,8 @@ public class BaseViewTest {
public void testWaterTurnedIntoWine() { public void testWaterTurnedIntoWine() {
Wine wine = new Wine(); Wine wine = new Wine();
assertEquals(wine.getBackendType(), TypeToken.of(Water.class)); assertEquals(wine.getBackendType(), TypeToken.of(Water.class));
assertEquals(wine.unwrap(TypeToken.of(Water.class)), new Water()); assertEquals(wine.unwrap(TypeToken.of(Water.class)).getClass(), Water.class);
assertEquals(wine.unwrap(), new Water()); assertEquals(wine.unwrap().getClass(), Water.class);
} }
public void testPeanutButterDidntTurnIntoWine() { public void testPeanutButterDidntTurnIntoWine() {

12
core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java
View File

@ -86,6 +86,10 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj == this)
return true;
DefaultConstructor other = DefaultConstructor.class.cast(obj); DefaultConstructor other = DefaultConstructor.class.cast(obj);
if (bar != other.bar) if (bar != other.bar)
return false; return false;
@ -158,6 +162,10 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj == this)
return true;
ValidatedConstructor other = ValidatedConstructor.class.cast(obj); ValidatedConstructor other = ValidatedConstructor.class.cast(obj);
if (bar != other.bar) if (bar != other.bar)
return false; return false;
@ -224,6 +232,10 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null)
return false;
if (obj == this)
return true;
RenamedFields other = RenamedFields.class.cast(obj); RenamedFields other = RenamedFields.class.cast(obj);
if (bar != other.bar) if (bar != other.bar)
return false; return false;