Skip to content

Commit ed28cd4

Browse files
committed
update tests
1 parent 4de3bfc commit ed28cd4

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

java-sdk-logging/logback-extension/src/test/java/com/google/api/logging/SDKLoggingMdcJsonProviderTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
import static org.mockito.ArgumentMatchers.any;
3434
import static org.mockito.ArgumentMatchers.anyString;
35+
import static org.mockito.Mockito.inOrder;
3536
import static org.mockito.Mockito.mock;
3637
import static org.mockito.Mockito.never;
3738
import static org.mockito.Mockito.verify;
@@ -46,6 +47,7 @@
4647
import org.junit.jupiter.api.AfterEach;
4748
import org.junit.jupiter.api.BeforeEach;
4849
import org.junit.jupiter.api.Test;
50+
import org.mockito.InOrder;
4951

5052
public class SDKLoggingMdcJsonProviderTest {
5153

@@ -93,9 +95,13 @@ void testWriteValidJsonStringToJsonTree() throws IOException {
9395
+ " }\n"
9496
+ "}");
9597

98+
provider.setFieldName("log-name");
9699
provider.writeTo(generator, event);
97-
verify(generator).writeFieldName("json1");
98-
verify(generator).writeTree(any(JsonNode.class));
100+
InOrder inOrder = inOrder(generator);
101+
inOrder.verify(generator).writeObjectFieldStart("log-name");
102+
inOrder.verify(generator).writeFieldName("json1");
103+
inOrder.verify(generator).writeTree(any(JsonNode.class));
104+
inOrder.verify(generator).writeEndObject();
99105
}
100106

101107
@Test
@@ -110,7 +116,6 @@ void testWriteInvalidJsonStringToString() throws IOException {
110116
+ " \"state\": \"ACTIVE\",\n" // the last semicolon is redundant.
111117
+ " }\n"
112118
+ "}");
113-
114119
provider.writeTo(generator, event);
115120
verify(generator).writeFieldName("json1");
116121
verify(generator).writeObject(anyString());

0 commit comments

Comments
 (0)