honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use assertThat instead of plain asserts in MemoryCircuitBreakerTests

This commit is contained in:
Simon Willnauer 2014-01-14 20:38:03 +01:00
parent 411739fe3b
commit fb3ea1feb0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java
View File

@ -54,7 +54,7 @@ public class MemoryCircuitBreakerTests extends ElasticsearchTestCase {
if (tripped.get()) { if (tripped.get()) {
assertThat("tripped too many times", true, equalTo(false)); assertThat("tripped too many times", true, equalTo(false));
} else { } else {
assert tripped.compareAndSet(false, true); assertThat(tripped.compareAndSet(false, true), equalTo(true));
} }
} catch (Throwable e2) { } catch (Throwable e2) {
lastException.set(e2); lastException.set(e2);
@ -86,7 +86,6 @@ public class MemoryCircuitBreakerTests extends ElasticsearchTestCase {
breaker.addEstimateBytesAndMaybeBreak(3); breaker.addEstimateBytesAndMaybeBreak(3);
fail("should never reach this"); fail("should never reach this");
} catch (CircuitBreakingException cbe) { } catch (CircuitBreakingException cbe) {
assert true;
} }
// shouldn't throw an exception // shouldn't throw an exception
@ -102,7 +101,6 @@ public class MemoryCircuitBreakerTests extends ElasticsearchTestCase {
breaker.addEstimateBytesAndMaybeBreak(0); breaker.addEstimateBytesAndMaybeBreak(0);
fail("should never reach this"); fail("should never reach this");
} catch (CircuitBreakingException cbe) { } catch (CircuitBreakingException cbe) {
assert true;
} }
} }
} }