aboutsummaryrefslogtreecommitdiff
path: root/guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java')
-rw-r--r--guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java129
1 files changed, 39 insertions, 90 deletions
diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java b/guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java
index 5f4210621..e4d310331 100644
--- a/guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java
+++ b/guava-tests/test/com/google/common/util/concurrent/AbstractServiceTest.java
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static java.lang.Thread.currentThread;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -449,12 +450,9 @@ public class AbstractServiceTest extends TestCase {
service.notifyFailed(new Exception("1"));
service.notifyFailed(new Exception("2"));
assertThat(service.failureCause()).hasMessageThat().isEqualTo("1");
- try {
- service.awaitRunning();
- fail();
- } catch (IllegalStateException e) {
- assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("1");
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.awaitRunning());
+ assertThat(e).hasCauseThat().hasMessageThat().isEqualTo("1");
}
private class ThreadedService extends AbstractService {
@@ -531,11 +529,7 @@ public class AbstractServiceTest extends TestCase {
service.stopAsync();
assertEquals(State.TERMINATED, service.state());
- try {
- service.startAsync();
- fail();
- } catch (IllegalStateException expected) {
- }
+ assertThrows(IllegalStateException.class, () -> service.startAsync());
assertEquals(State.TERMINATED, Iterables.getOnlyElement(listener.getStateHistory()));
}
@@ -543,13 +537,10 @@ public class AbstractServiceTest extends TestCase {
StartFailingService service = new StartFailingService();
RecordingListener listener = RecordingListener.record(service);
- try {
- service.startAsync().awaitRunning();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(EXCEPTION, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.startAsync().awaitRunning());
+ assertEquals(EXCEPTION, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
assertEquals(ImmutableList.of(State.STARTING, State.FAILED), listener.getStateHistory());
}
@@ -558,13 +549,10 @@ public class AbstractServiceTest extends TestCase {
RecordingListener listener = RecordingListener.record(service);
service.startAsync().awaitRunning();
- try {
- service.stopAsync().awaitTerminated();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(EXCEPTION, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.stopAsync().awaitTerminated());
+ assertEquals(EXCEPTION, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
assertEquals(
ImmutableList.of(State.STARTING, State.RUNNING, State.STOPPING, State.FAILED),
listener.getStateHistory());
@@ -575,13 +563,10 @@ public class AbstractServiceTest extends TestCase {
RecordingListener listener = RecordingListener.record(service);
service.startAsync();
- try {
- service.awaitRunning();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(EXCEPTION, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.awaitRunning());
+ assertEquals(EXCEPTION, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
assertEquals(
ImmutableList.of(State.STARTING, State.RUNNING, State.FAILED), listener.getStateHistory());
}
@@ -590,13 +575,10 @@ public class AbstractServiceTest extends TestCase {
StartThrowingService service = new StartThrowingService();
RecordingListener listener = RecordingListener.record(service);
- try {
- service.startAsync().awaitRunning();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(service.exception, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(service.exception);
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.startAsync().awaitRunning());
+ assertEquals(service.exception, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(service.exception);
assertEquals(ImmutableList.of(State.STARTING, State.FAILED), listener.getStateHistory());
}
@@ -605,13 +587,10 @@ public class AbstractServiceTest extends TestCase {
RecordingListener listener = RecordingListener.record(service);
service.startAsync().awaitRunning();
- try {
- service.stopAsync().awaitTerminated();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(service.exception, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(service.exception);
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.stopAsync().awaitTerminated());
+ assertEquals(service.exception, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(service.exception);
assertEquals(
ImmutableList.of(State.STARTING, State.RUNNING, State.STOPPING, State.FAILED),
listener.getStateHistory());
@@ -622,37 +601,23 @@ public class AbstractServiceTest extends TestCase {
RecordingListener listener = RecordingListener.record(service);
service.startAsync();
- try {
- service.awaitTerminated();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(service.exception, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(service.exception);
- }
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.awaitTerminated());
+ assertEquals(service.exception, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(service.exception);
assertEquals(
ImmutableList.of(State.STARTING, State.RUNNING, State.FAILED), listener.getStateHistory());
}
public void testFailureCause_throwsIfNotFailed() {
StopFailingService service = new StopFailingService();
- try {
- service.failureCause();
- fail();
- } catch (IllegalStateException expected) {
- }
+ assertThrows(IllegalStateException.class, () -> service.failureCause());
service.startAsync().awaitRunning();
- try {
- service.failureCause();
- fail();
- } catch (IllegalStateException expected) {
- }
- try {
- service.stopAsync().awaitTerminated();
- fail();
- } catch (IllegalStateException e) {
- assertEquals(EXCEPTION, service.failureCause());
- assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
- }
+ assertThrows(IllegalStateException.class, () -> service.failureCause());
+ IllegalStateException e =
+ assertThrows(IllegalStateException.class, () -> service.stopAsync().awaitTerminated());
+ assertEquals(EXCEPTION, service.failureCause());
+ assertThat(e).hasCauseThat().isEqualTo(EXCEPTION);
}
public void testAddListenerAfterFailureDoesntCauseDeadlock() throws InterruptedException {
@@ -912,40 +877,24 @@ public class AbstractServiceTest extends TestCase {
public void testNotifyStartedWhenNotStarting() {
AbstractService service = new DefaultService();
- try {
- service.notifyStarted();
- fail();
- } catch (IllegalStateException expected) {
- }
+ assertThrows(IllegalStateException.class, () -> service.notifyStarted());
}
public void testNotifyStoppedWhenNotRunning() {
AbstractService service = new DefaultService();
- try {
- service.notifyStopped();
- fail();
- } catch (IllegalStateException expected) {
- }
+ assertThrows(IllegalStateException.class, () -> service.notifyStopped());
}
public void testNotifyFailedWhenNotStarted() {
AbstractService service = new DefaultService();
- try {
- service.notifyFailed(new Exception());
- fail();
- } catch (IllegalStateException expected) {
- }
+ assertThrows(IllegalStateException.class, () -> service.notifyFailed(new Exception()));
}
public void testNotifyFailedWhenTerminated() {
NoOpService service = new NoOpService();
service.startAsync().awaitRunning();
service.stopAsync().awaitTerminated();
- try {
- service.notifyFailed(new Exception());
- fail();
- } catch (IllegalStateException expected) {
- }
+ assertThrows(IllegalStateException.class, () -> service.notifyFailed(new Exception()));
}
private static class DefaultService extends AbstractService {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 11:36:20 +0000