grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: DelayedStream getAttributes to throw IllegalStateExeption if not passThrough

This commit is contained in:
ZHANG Dapeng 2017-02-10 11:13:10 -08:00 committed by GitHub
parent 700abb32af
commit 9c78b466b6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/io/grpc/internal/DelayedStream.java
View File

@ -217,10 +217,8 @@ class DelayedStream implements ClientStream {
@Override @Override
public Attributes getAttributes() { public Attributes getAttributes() {
if (passThrough) { checkState(passThrough, "Called getAttributes before attributes are ready");
return realStream.getAttributes(); return realStream.getAttributes();
}
return Attributes.EMPTY;
} }
@Override @Override

13
core/src/test/java/io/grpc/internal/DelayedStreamTest.java
View File

@ -34,6 +34,7 @@ package io.grpc.internal;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.same; import static org.mockito.Matchers.same;
@ -53,9 +54,7 @@ import io.grpc.Status;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.InputStream; import java.io.InputStream;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@ -70,8 +69,6 @@ import org.mockito.MockitoAnnotations;
*/ */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class DelayedStreamTest { public class DelayedStreamTest {
@Rule public final ExpectedException thrown = ExpectedException.none();
@Mock private ClientStreamListener listener; @Mock private ClientStreamListener listener;
@Mock private ClientStream realStream; @Mock private ClientStream realStream;
@Captor private ArgumentCaptor<ClientStreamListener> listenerCaptor; @Captor private ArgumentCaptor<ClientStreamListener> listenerCaptor;
@ -208,7 +205,13 @@ public class DelayedStreamTest {
when(realStream.getAttributes()).thenReturn(attributes); when(realStream.getAttributes()).thenReturn(attributes);
stream.start(listener); stream.start(listener);
assertEquals(Attributes.EMPTY, stream.getAttributes());
try {
stream.getAttributes(); // expect to throw IllegalStateException, otherwise fail()
fail();
} catch (IllegalStateException expected) {
// ignore
}
stream.setStream(realStream); stream.setStream(realStream);
assertEquals(attributes, stream.getAttributes()); assertEquals(attributes, stream.getAttributes());