Update from Google.

--
MOE_MIGRATED_REVID=85702957

2 files changed, 273 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/testutiltests/JunitTestUtilsTest.java b/src/test/java/com/google/devtools/build/lib/testutiltests/JunitTestUtilsTest.java
new file mode 100644
index 0000000000..4bfe0faf37
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/testutiltests/JunitTestUtilsTest.java
@@ -0,0 +1,132 @@
+// Copyright 2014 Google Inc. 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.testutiltests;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.JunitTestUtils.assertContainsSublist;
+import static com.google.devtools.build.lib.testutil.JunitTestUtils.assertDoesNotContainSublist;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests {@link com.google.devtools.build.lib.testutil.JunitTestUtils}.
+ */
+@RunWith(JUnit4.class)
+public class JunitTestUtilsTest {
+
+  @Test
+  public void testAssertContainsSublistSuccess() {
+    List<String> actual = Arrays.asList("a", "b", "c");
+
+    // All single-string combinations.
+    assertContainsSublist(actual, "a");
+    assertContainsSublist(actual, "b");
+    assertContainsSublist(actual, "c");
+
+    // All two-string combinations.
+    assertContainsSublist(actual, "a", "b");
+    assertContainsSublist(actual, "b", "c");
+
+    // The whole list.
+    assertContainsSublist(actual, "a", "b", "c");
+  }
+
+  @Test
+  public void testAssertContainsSublistFailure() {
+    List<String> actual = Arrays.asList("a", "b", "c");
+
+    try {
+      assertContainsSublist(actual, "d");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e.getMessage()).startsWith("Did not find [d] as a sublist of [a, b, c]");
+    }
+
+    try {
+      assertContainsSublist(actual, "a", "c");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e.getMessage()).startsWith("Did not find [a, c] as a sublist of [a, b, c]");
+    }
+
+    try {
+      assertContainsSublist(actual, "b", "c", "d");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e.getMessage()).startsWith("Did not find [b, c, d] as a sublist of [a, b, c]");
+    }
+  }
+
+  @Test
+  public void testAssertDoesNotContainSublistSuccess() {
+    List<String> actual = Arrays.asList("a", "b", "c");
+    assertDoesNotContainSublist(actual, "d");
+    assertDoesNotContainSublist(actual, "a", "c");
+    assertDoesNotContainSublist(actual, "b", "c", "d");
+  }
+
+  @Test
+  public void testAssertDoesNotContainSublistFailure() {
+    List<String> actual = Arrays.asList("a", "b", "c");
+
+    // All single-string combinations.
+    try {
+      assertDoesNotContainSublist(actual, "a");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessage("Found [a] as a sublist of [a, b, c]");
+    }
+    try {
+      assertDoesNotContainSublist(actual, "b");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessage("Found [b] as a sublist of [a, b, c]");
+    }
+    try {
+      assertDoesNotContainSublist(actual, "c");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessage("Found [c] as a sublist of [a, b, c]");
+    }
+
+    // All two-string combinations.
+    try {
+      assertDoesNotContainSublist(actual, "a", "b");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessage("Found [a, b] as a sublist of [a, b, c]");
+    }
+    try {
+      assertDoesNotContainSublist(actual, "b", "c");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessage("Found [b, c] as a sublist of [a, b, c]");
+    }
+
+    // The whole list.
+    try {
+      assertDoesNotContainSublist(actual, "a", "b", "c");
+      fail("no exception thrown");
+    } catch (AssertionError e) {
+      assertThat(e).hasMessage("Found [a, b, c] as a sublist of [a, b, c]");
+    }
+  }
+
+}
diff --git a/src/test/java/com/google/devtools/build/lib/testutiltests/TestSizeAnnotationTest.java b/src/test/java/com/google/devtools/build/lib/testutiltests/TestSizeAnnotationTest.java
new file mode 100644
index 0000000000..5380cba7bd
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/testutiltests/TestSizeAnnotationTest.java
@@ -0,0 +1,141 @@
+// Copyright 2014 Google Inc. 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.testutiltests;
+
+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;
+
+/**
+ * Tests {@link com.google.devtools.build.lib.testutil.Suite#getSize(Class)}.
+ */
+@RunWith(JUnit4.class)
+public class TestSizeAnnotationTest {
+
+  private static class HasNoTestSpecAnnotation {
+
+  }
+
+  @TestSpec(flaky = true)
+  private static class FlakyTestSpecAnnotation {
+
+  }
+
+  @TestSpec(suite = "foo")
+  private static class HasNoSizeAnnotationElement {
+
+  }
+
+  @TestSpec(size = Suite.SMALL_TESTS)
+  private static class IsAnnotatedWithSmallSize {
+
+  }
+
+  @TestSpec(size = Suite.MEDIUM_TESTS)
+  private static class IsAnnotatedWithMediumSize {
+
+  }
+
+  @TestSpec(size = Suite.LARGE_TESTS)
+  private static class IsAnnotatedWithLargeSize {
+
+  }
+
+  private static class SuperclassHasAnnotationButNoSizeElement
+      extends HasNoSizeAnnotationElement {
+
+  }
+
+  @TestSpec(size = Suite.LARGE_TESTS)
+  private static class HasSizeElementAndSuperclassHasAnnotationButNoSizeElement
+      extends HasNoSizeAnnotationElement {
+
+  }
+
+  private static class SuperclassHasAnnotationWithSizeElement
+      extends IsAnnotatedWithSmallSize {
+
+  }
+
+  @TestSpec(size = Suite.LARGE_TESTS)
+  private static class HasSizeElementAndSuperclassHasAnnotationWithSizeElement
+      extends IsAnnotatedWithSmallSize {
+
+  }
+
+  @Test
+  public void testHasNoTestSpecAnnotationIsSmall() {
+    assertEquals(Suite.SMALL_TESTS, getSize(HasNoTestSpecAnnotation.class));
+  }
+
+  @Test
+  public void testHasNoSizeAnnotationElementIsSmall() {
+    assertEquals(Suite.SMALL_TESTS, getSize(HasNoSizeAnnotationElement.class));
+  }
+
+  @Test
+  public void testIsAnnotatedWithSmallSizeIsSmall() {
+    assertEquals(Suite.SMALL_TESTS, getSize(IsAnnotatedWithSmallSize.class));
+  }
+
+  @Test
+  public void testIsAnnotatedWithMediumSizeIsMedium() {
+    assertEquals(Suite.MEDIUM_TESTS, getSize(IsAnnotatedWithMediumSize.class));
+  }
+
+  @Test
+  public void testIsAnnotatedWithLargeSizeIsLarge() {
+    assertEquals(Suite.LARGE_TESTS, getSize(IsAnnotatedWithLargeSize.class));
+  }
+
+  @Test
+  public void testSuperclassHasAnnotationButNoSizeElement() {
+    assertEquals(Suite.SMALL_TESTS, getSize(SuperclassHasAnnotationButNoSizeElement.class));
+  }
+
+  @Test
+  public void testHasSizeElementAndSuperclassHasAnnotationButNoSizeElement() {
+    assertEquals(Suite.LARGE_TESTS,
+        getSize(HasSizeElementAndSuperclassHasAnnotationButNoSizeElement.class));
+  }
+
+  @Test
+  public void testSuperclassHasAnnotationWithSizeElement() {
+    assertEquals(Suite.SMALL_TESTS, getSize(SuperclassHasAnnotationWithSizeElement.class));
+  }
+
+  @Test
+  public void testHasSizeElementAndSuperclassHasAnnotationWithSizeElement() {
+    assertEquals(Suite.LARGE_TESTS,
+        getSize(HasSizeElementAndSuperclassHasAnnotationWithSizeElement.class));
+  }
+
+  @Test
+  public void testIsNotFlaky() {
+    assertFalse(Suite.isFlaky(HasNoTestSpecAnnotation.class));
+  }
+  
+  @Test
+  public void testIsFlaky() {
+    assertTrue(Suite.isFlaky(FlakyTestSpecAnnotation.class));
+  }
+}