Repository: brooklyn-server Updated Branches: refs/heads/master d9e8cf490 -> d80fc9f5b
Add notEqual assertion to tests Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/246a25fc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/246a25fc Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/246a25fc Branch: refs/heads/master Commit: 246a25fc15360d3198bba25a83fab86d20876bf1 Parents: 8f9d73e Author: Svetoslav Neykov <[email protected]> Authored: Thu Jul 21 16:31:55 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Thu Jul 21 16:31:55 2016 +0300 ---------------------------------------------------------------------- .../test/framework/TestFrameworkAssertions.java | 6 +++++ .../framework/TestFrameworkAssertionsTest.java | 24 ++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/246a25fc/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java index fbe3ed0..6bbeb61 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import com.google.common.base.Joiner; import com.google.common.base.Supplier; @@ -47,6 +48,7 @@ public class TestFrameworkAssertions { public static final String IS_EQUAL_TO = "isEqualTo"; public static final String EQUAL_TO = "equalTo"; public static final String EQUALS = "equals"; + public static final String NOT_EQUAL = "notEqual"; public static final String MATCHES = "matches"; public static final String CONTAINS = "contains"; public static final String IS_EMPTY = "isEmpty"; @@ -177,6 +179,10 @@ public class TestFrameworkAssertions { } break; + case NOT_EQUAL : + if (Objects.equals(actual, expected)) { + failAssertion(target, NOT_EQUAL, expected); + } case IS_NULL : if (isTrue(expected) != (null == actual)) { failAssertion(target, IS_NULL, expected); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/246a25fc/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java index 1f2465b..d070ee9 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeUnit; public class TestFrameworkAssertionsTest { @@ -49,6 +50,8 @@ public class TestFrameworkAssertionsTest { {"some-sensor-value", Arrays.asList(ImmutableMap.of("isEqualTo", "some-sensor-value"))}, {"some-sensor-value", Arrays.asList(ImmutableMap.of("equalTo", "some-sensor-value"))}, {"some-sensor-value", Arrays.asList(ImmutableMap.of("equals", "some-sensor-value"))}, + {"some-sensor-value", Arrays.asList(ImmutableMap.of("notEqual", "other-sensor-value"))}, + {10, Arrays.asList(ImmutableMap.of("notEqual", 20))}, {"some-regex-value-to-match", Arrays.asList(ImmutableMap.of("matches", "some.*match", "isEqualTo", "some-regex-value-to-match"))}, {null, Arrays.asList(ImmutableMap.of("isNull", Boolean.TRUE))}, {"some-non-null-value", Arrays.asList(ImmutableMap.of("isNull", Boolean.FALSE))}, @@ -67,15 +70,15 @@ public class TestFrameworkAssertionsTest { } @Test(dataProvider = "positiveTestsDP") - public void positiveTest(final String data, final List<Map<String, Object>> assertions) { - final Supplier<String> supplier = new Supplier<String>() { + public void positiveTest(final Object data, final List<Map<String, Object>> assertions) { + final Supplier<Object> supplier = new Supplier<Object>() { @Override - public String get() { + public Object get() { LOG.info("Supplier invoked for data [{}]", data); return data; } }; - TestFrameworkAssertions.checkAssertions(ImmutableMap.of("timeout", new Duration(2L, TimeUnit.SECONDS)), assertions, data, supplier); + TestFrameworkAssertions.checkAssertions(ImmutableMap.of("timeout", new Duration(2L, TimeUnit.SECONDS)), assertions, Objects.toString(data), supplier); } @DataProvider @@ -86,6 +89,9 @@ public class TestFrameworkAssertionsTest { {"some-sensor-value", "equals", arbitrary, Arrays.asList(ImmutableMap.of("equalTo", arbitrary))}, {"some-sensor-value", "equals", arbitrary, Arrays.asList(ImmutableMap.of("equals", arbitrary))}, + {"some-sensor-value", "notEqual", "some-sensor-value", Arrays.asList(ImmutableMap.of("notEqual", "some-sensor-value"))}, + {10, "notEqual", new Integer(10), Arrays.asList(ImmutableMap.of("notEqual", new Integer(10)))}, + {"some-regex-value-to-match", "matches", "some.*not-match", Arrays.asList(ImmutableMap.of("matches", "some.*not-match", "isEqualTo", "oink"))}, {null, "notNull", Boolean.TRUE, Arrays.asList(ImmutableMap.of("notNull", Boolean.TRUE))}, @@ -108,19 +114,19 @@ public class TestFrameworkAssertionsTest { } @Test(dataProvider = "negativeTestsDP") - public void negativeTests(final String data, String condition, Object expected, final List<Map<String, Object>> assertions) { - final Supplier<String> supplier = new Supplier<String>() { + public void negativeTests(final Object data, String condition, Object expected, final List<Map<String, Object>> assertions) { + final Supplier<Object> supplier = new Supplier<Object>() { @Override - public String get() { + public Object get() { LOG.info("Supplier invoked for data [{}]", data); return data; } }; try { - TestFrameworkAssertions.checkAssertions(ImmutableMap.of("timeout", new Duration(2L, TimeUnit.SECONDS)), assertions, data, supplier); + TestFrameworkAssertions.checkAssertions(ImmutableMap.of("timeout", new Duration(2L, TimeUnit.SECONDS)), assertions, Objects.toString(data), supplier); Asserts.shouldHaveFailedPreviously(); } catch (AssertionError e) { - Asserts.expectedFailureContains(e, data, condition, expected.toString()); + Asserts.expectedFailureContains(e, Objects.toString(data), condition, expected.toString()); } }
