Repository: jclouds
Updated Branches:
refs/heads/master 5b5e713cb -> 8fa209b15
Use more specific testng asserts where possible
These asserts yield more informative error messages. Found with:
grep -rI 'assertTrue(.* =='
grep -rI 'assertTrue(.* !='
grep -rI 'assertTrue(.*\.equals('
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8fa209b1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8fa209b1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8fa209b1
Branch: refs/heads/master
Commit: 8fa209b15ec91829be3810dabc9b423296b58400
Parents: 5b5e713
Author: Andrew Gaul <[email protected]>
Authored: Tue Jun 24 13:22:25 2014 -0700
Committer: Andrew Gaul <[email protected]>
Committed: Tue Jun 24 13:54:01 2014 -0700
----------------------------------------------------------------------
.../compute/functions/IngressRuleToIpPermissionTest.java | 5 ++---
.../org/jclouds/cloudstack/features/ProjectApiLiveTest.java | 6 +++---
.../compute/functions/SecurityGroupRuleToIpPermissionTest.java | 4 ++--
.../nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java | 2 +-
.../blobstore/integration/internal/BaseContainerLiveTest.java | 3 ++-
.../jclouds/concurrent/config/ExecutorServiceModuleTest.java | 6 ++++--
.../java/org/jclouds/events/config/EventBusModuleTest.java | 3 ++-
.../ultradns/ws/features/TrafficControllerPoolApiLiveTest.java | 3 ++-
8 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
----------------------------------------------------------------------
diff --git
a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
index 8b857ff..aedf310 100644
---
a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
+++
b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
@@ -17,7 +17,6 @@
package org.jclouds.cloudstack.compute.functions;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
import org.jclouds.cloudstack.domain.IngressRule;
import org.jclouds.net.domain.IpPermission;
@@ -53,7 +52,7 @@ public class IngressRuleToIpPermissionTest {
assertEquals(convertedPerm.getFromPort(), ruleToConvert.getStartPort());
assertEquals(convertedPerm.getToPort(), ruleToConvert.getEndPort());
assertEquals(convertedPerm.getCidrBlocks(),
ImmutableSet.of("0.0.0.0/0"));
- assertTrue(convertedPerm.getTenantIdGroupNamePairs().size() == 1);
- assertTrue(convertedPerm.getGroupIds().size() == 0);
+ assertEquals(convertedPerm.getTenantIdGroupNamePairs().size(), 1);
+ assertEquals(convertedPerm.getGroupIds().size(), 0);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
----------------------------------------------------------------------
diff --git
a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
index e0e9854..071c9d9 100644
---
a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
+++
b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
@@ -17,8 +17,8 @@
package org.jclouds.cloudstack.features;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
import org.jclouds.cloudstack.domain.Project;
import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
@@ -39,8 +39,8 @@ public class ProjectApiLiveTest extends
BaseCloudStackApiLiveTest {
protected void checkProject(Project project) {
assertNotNull(project.getId());
assertEquals(project.toString(),
client.getProjectApi().getProject(project.getId()).toString());
- assertTrue(project.getState() != null);
- assertTrue(project.getState() != Project.State.UNRECOGNIZED);
+ assertNotNull(project.getState());
+ assertNotEquals(project.getState(), Project.State.UNRECOGNIZED);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
----------------------------------------------------------------------
diff --git
a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
index 1d3bb50..dedf100 100644
---
a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
+++
b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
@@ -54,7 +54,7 @@ public class SecurityGroupRuleToIpPermissionTest {
assertEquals(convertedPerm.getFromPort(), ruleToConvert.getFromPort());
assertEquals(convertedPerm.getToPort(), ruleToConvert.getToPort());
assertTrue(convertedPerm.getGroupIds().contains("az-1.region-a.geo-1/some-id"));
- assertTrue(convertedPerm.getCidrBlocks().size() == 0);
+ assertEquals(convertedPerm.getCidrBlocks().size(), 0);
}
@Test
@@ -74,6 +74,6 @@ public class SecurityGroupRuleToIpPermissionTest {
assertEquals(convertedPerm.getFromPort(), ruleToConvert.getFromPort());
assertEquals(convertedPerm.getToPort(), ruleToConvert.getToPort());
assertEquals(convertedPerm.getCidrBlocks(),
ImmutableSet.of("0.0.0.0/0"));
- assertTrue(convertedPerm.getTenantIdGroupNamePairs().size() == 0);
+ assertEquals(convertedPerm.getTenantIdGroupNamePairs().size(), 0);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git
a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
index 142cd36..d3b71db 100644
---
a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
+++
b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
@@ -53,7 +53,7 @@ public class AvailabilityZoneApiExpectTest extends
BaseNovaApiExpectTest {
Optional<? extends AvailabilityZone> zone = zones.first();
assertTrue(zone.isPresent(), "Couldn't find zone");
- assertTrue(zone.get().getName().equals("nova"), "Expected zone name to
be nova but it was: " + zone.get().getName());
+ assertEquals(zone.get().getName(), "nova", "Expected zone name to be
nova but it was: " + zone.get().getName());
assertTrue(zone.get().getState().available(), "Zone: " +
zone.get().getName() + " is not available.");
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
----------------------------------------------------------------------
diff --git
a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
index dbe3605..b2f7d68 100644
---
a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
+++
b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
@@ -20,6 +20,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.jclouds.blobstore.options.CreateContainerOptions.Builder.publicRead;
import static org.jclouds.util.Predicates2.retry;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
@@ -71,7 +72,7 @@ public class BaseContainerLiveTest extends
BaseBlobStoreIntegrationTest {
BlobMetadata metadata =
view.getBlobStore().blobMetadata(containerName, "hello");
- assertTrue(metadata.getPublicUri() != null, metadata.toString());
+ assertNotNull(metadata.getPublicUri(), metadata.toString());
SocketOpen socketOpen =
context.utils().injector().getInstance(SocketOpen.class);
Predicate<HostAndPort> socketTester = retry(socketOpen, 1200, 10,
SECONDS);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java
----------------------------------------------------------------------
diff --git
a/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java
b/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java
index 5ee6143..a935999 100644
---
a/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java
+++
b/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java
@@ -25,6 +25,8 @@ import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS;
import static org.jclouds.Constants.PROPERTY_USER_THREADS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
@@ -114,8 +116,8 @@ public class ExecutorServiceModuleTest {
}
static void assertTraceHasSubmission(String trace, String expected) {
- assertTrue(trace.indexOf(WithSubmissionTrace.class.getName()) == -1,
trace);
- assertTrue(trace.indexOf(expected) != -1, trace + " " + expected);
+ assertEquals(trace.indexOf(WithSubmissionTrace.class.getName()), -1,
trace);
+ assertNotEquals(trace.indexOf(expected), -1, trace + " " + expected);
}
static <E extends Exception> E incrementInitialElement(E ex, int lines) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/core/src/test/java/org/jclouds/events/config/EventBusModuleTest.java
----------------------------------------------------------------------
diff --git
a/core/src/test/java/org/jclouds/events/config/EventBusModuleTest.java
b/core/src/test/java/org/jclouds/events/config/EventBusModuleTest.java
index 288ea0e..3a0af75 100644
--- a/core/src/test/java/org/jclouds/events/config/EventBusModuleTest.java
+++ b/core/src/test/java/org/jclouds/events/config/EventBusModuleTest.java
@@ -17,6 +17,7 @@
package org.jclouds.events.config;
import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
import static org.testng.Assert.assertTrue;
import org.jclouds.Constants;
@@ -69,6 +70,6 @@ public class EventBusModuleTest {
EventBus eventBus1 = injector.getInstance(EventBus.class);
EventBus eventBus2 = injector.getInstance(EventBus.class);
- assertTrue(eventBus1 == eventBus2);
+ assertSame(eventBus1, eventBus2);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8fa209b1/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiLiveTest.java
----------------------------------------------------------------------
diff --git
a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiLiveTest.java
b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiLiveTest.java
index 463e35a..8f67b00 100644
---
a/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiLiveTest.java
+++
b/providers/ultradns-ws/src/test/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApiLiveTest.java
@@ -23,6 +23,7 @@ import static
org.jclouds.ultradns.ws.predicates.TrafficControllerPoolPredicates
import static
org.jclouds.ultradns.ws.predicates.TrafficControllerPoolPredicates.recordIdEqualTo;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
@@ -102,7 +103,7 @@ public class TrafficControllerPoolApiLiveTest extends
BaseUltraDNSWSApiLiveTest
assertTrue(record.getWeight() >= 0, "Weight must be unsigned for " +
record);
assertTrue(record.getPriority() >= 0, "Priority must be unsigned for " +
record);
assertNotNull(record.getStatus(), "Status cannot be null for " + record);
- assertTrue(record.getStatus() != UNRECOGNIZED, "unrecognized status for
" + record);
+ assertNotEquals(record.getStatus(), UNRECOGNIZED, "unrecognized status
for " + record);
assertNotNull(record.getDescription(), "Description cannot be null for "
+ record);
return record;
}
