You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/02/07 16:33:41 UTC
[4/6] brooklyn-server git commit: Check for NPE in tests and use
isPositive check for Duration
Check for NPE in tests and use isPositive check for Duration
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d6041d40
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d6041d40
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d6041d40
Branch: refs/heads/master
Commit: d6041d4076c13d45f40c95856ddcd99ac736ea2c
Parents: 68664b8
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Tue Jan 31 16:14:58 2017 +0000
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Thu Feb 2 18:33:47 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/brooklyn/util/repeat/Repeater.java | 4 ++--
.../test/java/org/apache/brooklyn/util/repeat/RepeaterTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d6041d40/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java b/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
index 4f371de..e2acdc1 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
@@ -184,7 +184,7 @@ public class Repeater implements Callable<Boolean> {
*/
public Repeater every(Duration duration) {
Preconditions.checkNotNull(duration, "duration must not be null");
- Preconditions.checkArgument(duration.toMilliseconds()>0, "period must be positive: %s", duration);
+ Preconditions.checkArgument(duration.isPositive(), "period must be positive: %s", duration);
return delayOnIteration(Functions.constant(duration));
}
@@ -321,7 +321,7 @@ public class Repeater implements Callable<Boolean> {
*/
public Repeater limitTimeTo(Duration duration) {
Preconditions.checkNotNull(duration, "duration must not be null");
- Preconditions.checkArgument(duration.toMilliseconds() > 0, "deadline must be positive: %s", duration);
+ Preconditions.checkArgument(duration.isPositive(), "deadline must be positive: %s", duration);
this.timeLimit = duration;
return this;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d6041d40/utils/common/src/test/java/org/apache/brooklyn/util/repeat/RepeaterTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/repeat/RepeaterTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/repeat/RepeaterTest.java
index 728120e..06e67ad 100644
--- a/utils/common/src/test/java/org/apache/brooklyn/util/repeat/RepeaterTest.java
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/repeat/RepeaterTest.java
@@ -187,7 +187,7 @@ public class RepeaterTest {
assertTrue(difference < 4 * LIMIT, "Difference was: " + difference);
}
- @Test(expectedExceptions = { IllegalStateException.class })
+ @Test(expectedExceptions = { NullPointerException.class })
public void runFailsIfUntilWasNotSet() {
new Repeater("runFailsIfUntilWasNotSet")
.every(Duration.millis(10))
@@ -195,7 +195,7 @@ public class RepeaterTest {
fail("Expected exception was not thrown");
}
- @Test(expectedExceptions = { IllegalStateException.class })
+ @Test(expectedExceptions = { NullPointerException.class })
public void runFailsIfEveryWasNotSet() {
new Repeater("runFailsIfEveryWasNotSet")
.until(Callables.returning(true))