Move LoggingTerminalWriter out of test

...so that it can be used by the main code base.

--
Change-Id: Ibf59d74ab1b0cca9bd9406bb76ee6e71189653bf
Reviewed-on: https://bazel-review.googlesource.com/#/c/3903
MOS_MIGRATED_REVID=125950656

4 files changed, 1 insertions, 91 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java
index da25a610b9..a416abfee0 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java
@@ -32,9 +32,9 @@ import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.LoadingPhaseStartedEvent;
 import com.google.devtools.build.lib.skyframe.PackageProgressReceiver;
 import com.google.devtools.build.lib.testutil.FoundationTestCase;
-import com.google.devtools.build.lib.testutil.LoggingTerminalWriter;
 import com.google.devtools.build.lib.testutil.ManualClock;
 import com.google.devtools.build.lib.util.Pair;
+import com.google.devtools.build.lib.util.io.LoggingTerminalWriter;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus;
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/LoggingTerminalWriter.java b/src/test/java/com/google/devtools/build/lib/testutil/LoggingTerminalWriter.java
deleted file mode 100644
index 386655029a..0000000000
--- a/src/test/java/com/google/devtools/build/lib/testutil/LoggingTerminalWriter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// 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.testutil;
-
-import com.google.devtools.build.lib.util.io.AnsiTerminalWriter;
-
-import java.io.IOException;
-
-/**
- * An {@link AnsiTerminalWriter} that keeps just generates a transcript
- * of the events it was exposed of.
- */
-public class LoggingTerminalWriter implements AnsiTerminalWriter {
-  // Strings for recording the non-append calls
-  public static final String NEWLINE = "[NL]";
-  public static final String OK = "[OK]";
-  public static final String FAIL = "[FAIL]";
-  public static final String NORMAL = "[NORMAL]";
-
-  private String transcript;
-  private final boolean discardHighlight;
-
-  public LoggingTerminalWriter(boolean discardHighlight) {
-    this.transcript = "";
-    this.discardHighlight = discardHighlight;
-  }
-
-  public LoggingTerminalWriter() {
-    this(false);
-  }
-
-  @Override
-  public AnsiTerminalWriter append(String text) throws IOException {
-    transcript += text;
-    return this;
-  }
-
-  @Override
-  public AnsiTerminalWriter newline() throws IOException {
-    if (!discardHighlight) {
-      transcript += NEWLINE;
-    } else {
-      transcript += "\n";
-    }
-    return this;
-  }
-
-  @Override
-  public AnsiTerminalWriter okStatus() throws IOException {
-    if (!discardHighlight) {
-      transcript += OK;
-    }
-    return this;
-  }
-
-  @Override
-  public AnsiTerminalWriter failStatus() throws IOException {
-    if (!discardHighlight) {
-      transcript += FAIL;
-    }
-    return this;
-  }
-
-  @Override
-  public AnsiTerminalWriter normal() throws IOException {
-    if (!discardHighlight) {
-      transcript += NORMAL;
-    }
-    return this;
-  }
-
-  public String getTranscript() {
-    return transcript;
-  }
-}
diff --git a/src/test/java/com/google/devtools/build/lib/util/io/LineWrappingAnsiTerminalWriterTest.java b/src/test/java/com/google/devtools/build/lib/util/io/LineWrappingAnsiTerminalWriterTest.java
index 7115648138..a7a39d2db0 100644
--- a/src/test/java/com/google/devtools/build/lib/util/io/LineWrappingAnsiTerminalWriterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/io/LineWrappingAnsiTerminalWriterTest.java
@@ -15,8 +15,6 @@ package com.google.devtools.build.lib.util.io;
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.devtools.build.lib.testutil.LoggingTerminalWriter;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/google/devtools/build/lib/util/io/PositionAwareAnsiTerminalWriterTest.java b/src/test/java/com/google/devtools/build/lib/util/io/PositionAwareAnsiTerminalWriterTest.java
index 9de74a038d..ec1c809dc3 100644
--- a/src/test/java/com/google/devtools/build/lib/util/io/PositionAwareAnsiTerminalWriterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/io/PositionAwareAnsiTerminalWriterTest.java
@@ -15,8 +15,6 @@ package com.google.devtools.build.lib.util.io;
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.devtools.build.lib.testutil.LoggingTerminalWriter;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;