diff options
author | Klaus Aehlig <aehlig@google.com> | 2017-05-11 11:24:09 -0400 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2017-05-11 14:41:14 -0400 |
commit | 1d287fc8582a693fe1b2b673663ab9952417e87c (patch) | |
tree | 01a12512962f66eee1773fceeedaf9c379cba517 /src/test | |
parent | 34195c5caa1522a3d8452f7ab96ab81760917f6b (diff) |
BEP: add a JSON transport
As JSON is a widely supported format, also add a transport writing
the build events in JSON format. This will allow more tools to get
status reports about builds.
Change-Id: I7e5901cc65d927b93c8fc9bcd2d2baa7e707f09e
PiperOrigin-RevId: 155750964
Diffstat (limited to 'src/test')
3 files changed, 103 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD index 597dec1d01..99cb5856f0 100644 --- a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD +++ b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD @@ -21,5 +21,6 @@ java_test( "//third_party:mockito", "//third_party:truth", "//third_party/protobuf:protobuf_java", + "//third_party/protobuf:protobuf_java_util", ], ) diff --git a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransportTest.java b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransportTest.java new file mode 100644 index 0000000000..a1414de41d --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/JsonFormatFileTransportTest.java @@ -0,0 +1,88 @@ +// Copyright 2016 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.devtools.build.lib.buildeventstream.transports; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.when; + +import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer; +import com.google.devtools.build.lib.buildeventstream.BuildEvent; +import com.google.devtools.build.lib.buildeventstream.BuildEventConverters; +import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; +import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildStarted; +import com.google.devtools.build.lib.buildeventstream.PathConverter; +import com.google.protobuf.util.JsonFormat; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +/** Tests {@link TextFormatFileTransport}. * */ +@RunWith(JUnit4.class) +public class JsonFormatFileTransportTest { + + @Rule public TemporaryFolder tmp = new TemporaryFolder(); + + @Mock public BuildEvent buildEvent; + + @Mock public PathConverter pathConverter; + @Mock public ArtifactGroupNamer artifactGroupNamer; + + @Before + public void initMocks() { + MockitoAnnotations.initMocks(this); + } + + @After + public void validateMocks() { + Mockito.validateMockitoUsage(); + } + + @Test + public void testCreatesFileAndWritesProtoJsonFormat() throws Exception { + File output = tmp.newFile(); + + BuildEventStreamProtos.BuildEvent started = + BuildEventStreamProtos.BuildEvent.newBuilder() + .setStarted(BuildStarted.newBuilder().setCommand("build")) + .build(); + when(buildEvent.asStreamProto(Matchers.<BuildEventConverters>any())).thenReturn(started); + JsonFormatFileTransport transport = + new JsonFormatFileTransport(output.getAbsolutePath(), pathConverter); + transport.sendBuildEvent(buildEvent, artifactGroupNamer); + + transport.close().get(); + try (InputStream in = new FileInputStream(output)) { + Reader reader = new InputStreamReader(in); + JsonFormat.Parser parser = JsonFormat.parser(); + BuildEventStreamProtos.BuildEvent.Builder builder = + BuildEventStreamProtos.BuildEvent.newBuilder(); + parser.merge(reader, builder); + assertThat(builder.build()).isEqualTo(started); + } + } +} diff --git a/src/test/shell/integration/build_event_stream_test.sh b/src/test/shell/integration/build_event_stream_test.sh index 3ff71aa268..6ab1a84029 100755 --- a/src/test/shell/integration/build_event_stream_test.sh +++ b/src/test/shell/integration/build_event_stream_test.sh @@ -332,9 +332,23 @@ function test_multiple_transports() { bazel test \ --experimental_build_event_text_file=${outdir}/test_multiple_transports.txt \ --experimental_build_event_binary_file=${outdir}/test_multiple_transports.bin \ + --experimental_build_event_json_file=${outdir}/test_multiple_transports.json \ pkg:suite || fail "bazel test failed" [ -f ${outdir}/test_multiple_transports.txt ] || fail "Missing expected file test_multiple_transports.txt" [ -f ${outdir}/test_multiple_transports.bin ] || fail "Missing expected file test_multiple_transports.bin" + [ -f ${outdir}/test_multiple_transports.json ] || fail "Missing expected file test_multiple_transports.bin" +} + +function test_basic_json() { + # Verify that the json transport writes json files + bazel test --experimental_build_event_json_file=$TEST_log pkg:true \ + || fail "bazel test failed" + # check for some typical fragments that would be encoded differently in the + # proto text format. + expect_log '"started"' + expect_log '"id"' + expect_log '"children" *: *\[' + expect_log '"overallSuccess": true' } function test_root_cause_early() { |