Split & refactor testutil/BUILD.

--
MOS_MIGRATED_REVID=108852682

3 files changed, 3 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index d293937b51..c44d50b5bf 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -152,7 +152,7 @@ java_test(
             "collect/*.java",
             "collect/nestedset/*.java",
             "events/*.java",
-            "testutiltests/*.java",
+            "testutil/*Test.java",
             "unix/*.java",
             "util/*.java",
             "util/io/*.java",
diff --git a/src/test/java/com/google/devtools/build/lib/testutiltests/MoreAssertsTest.java b/src/test/java/com/google/devtools/build/lib/testutil/MoreAssertsTest.java
index 44c489fb35..975e365361 100644
--- a/src/test/java/com/google/devtools/build/lib/testutiltests/MoreAssertsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/MoreAssertsTest.java
@@ -11,7 +11,7 @@
 // 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.testutiltests;
+package com.google.devtools.build.lib.testutil;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsSublist;
diff --git a/src/test/java/com/google/devtools/build/lib/testutiltests/TestSizeAnnotationTest.java b/src/test/java/com/google/devtools/build/lib/testutil/TestSizeAnnotationTest.java
index 501dfbe8d7..810cfa1cf7 100644
--- a/src/test/java/com/google/devtools/build/lib/testutiltests/TestSizeAnnotationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestSizeAnnotationTest.java
@@ -11,16 +11,13 @@
 // 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.testutiltests;
+package com.google.devtools.build.lib.testutil;
 
 import static com.google.devtools.build.lib.testutil.Suite.getSize;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.google.devtools.build.lib.testutil.Suite;
-import com.google.devtools.build.lib.testutil.TestSpec;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;