1 files changed, 21 insertions, 23 deletions
diff --git a/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java b/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java
index 89bb1bbf15..03b270c4fc 100644
--- a/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java
+++ b/src/test/java/com/google/devtools/build/docgen/RuleDocumentationAttributeTest.java
@@ -39,69 +39,67 @@ public class RuleDocumentationAttributeTest {
   @Test
   public void testDirectChild() {
     RuleDocumentationAttribute attr1 = RuleDocumentationAttribute.create(
-        IntermediateRule.class, "", "", 0, NO_FLAGS);
+        IntermediateRule.class, "", "", 0, "", NO_FLAGS);
     assertEquals(1, attr1.getDefinitionClassAncestryLevel(TestRule.class));
   }
 
   @Test
   public void testTransitiveChild() {
     RuleDocumentationAttribute attr2 = RuleDocumentationAttribute.create(
-        BaseRule.class, "", "", 0, NO_FLAGS);
+        BaseRule.class, "", "", 0, "", NO_FLAGS);
     assertEquals(2, attr2.getDefinitionClassAncestryLevel(TestRule.class));
   }
 
   @Test
   public void testClassIsNotChild() {
     RuleDocumentationAttribute attr2 = RuleDocumentationAttribute.create(
-        IntermediateRule.class, "", "", 0, NO_FLAGS);
+        IntermediateRule.class, "", "", 0, "", NO_FLAGS);
     assertEquals(-1, attr2.getDefinitionClassAncestryLevel(BaseRule.class));
   }
 
   @Test
   public void testClassIsSame() {
     RuleDocumentationAttribute attr3 = RuleDocumentationAttribute.create(
-        TestRule.class, "", "", 0, NO_FLAGS);
+        TestRule.class, "", "", 0, "", NO_FLAGS);
     assertEquals(0, attr3.getDefinitionClassAncestryLevel(TestRule.class));
   }
 
   @Test
   public void testHasFlags() {
     RuleDocumentationAttribute attr = RuleDocumentationAttribute.create(
-        TestRule.class, "", "", 0, ImmutableSet.<String>of("SOME_FLAG"));
+        TestRule.class, "", "", 0, "", ImmutableSet.<String>of("SOME_FLAG"));
     assertTrue(attr.hasFlag("SOME_FLAG"));
   }
 
   @Test
   public void testCompareTo() {
-    assertTrue(
-        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, NO_FLAGS)
-        .compareTo(
-            RuleDocumentationAttribute.create(TestRule.class, "b", "", 0, NO_FLAGS))
-            == -1);
+    assertEquals(
+        -1,
+        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, "", NO_FLAGS).compareTo(
+            RuleDocumentationAttribute.create(TestRule.class, "b", "", 0, "", NO_FLAGS)));
   }
 
   @Test
   public void testCompareToWithPriorityAttributeName() {
-    assertTrue(
-        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, NO_FLAGS)
-        .compareTo(
-            RuleDocumentationAttribute.create(TestRule.class, "name", "", 0, NO_FLAGS))
-            == 1);
+    assertEquals(
+        1,
+        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, "", NO_FLAGS).compareTo(
+            RuleDocumentationAttribute.create(TestRule.class, "name", "", 0, "", NO_FLAGS)));
   }
 
   @Test
   public void testEquals() {
     assertEquals(
-        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, NO_FLAGS),
-        RuleDocumentationAttribute.create(IntermediateRule.class, "a", "", 0, NO_FLAGS));
+        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, "", NO_FLAGS),
+        RuleDocumentationAttribute.create(IntermediateRule.class, "a", "", 0, "", NO_FLAGS));
   }
 
   @Test
   public void testHashCode() {
     assertEquals(
-        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, NO_FLAGS)
+        RuleDocumentationAttribute.create(TestRule.class, "a", "", 0, "", NO_FLAGS)
         .hashCode(),
-        RuleDocumentationAttribute.create(IntermediateRule.class, "a", "", 0, NO_FLAGS)
+        RuleDocumentationAttribute.create(IntermediateRule.class, "a", "", 0, "", NO_FLAGS)
         .hashCode());
   }
 
@@ -111,7 +109,7 @@ public class RuleDocumentationAttributeTest {
     Attribute attribute = Attribute.attr("foo_version", Type.STRING)
         .value(defaultValue).build();
     RuleDocumentationAttribute attributeDoc = RuleDocumentationAttribute.create(
-        TestRule.class, "testrule", "", 0, NO_FLAGS);
+        TestRule.class, "testrule", "", 0, "", NO_FLAGS);
     attributeDoc.setAttribute(attribute);
     String doc = attributeDoc.getSynopsis();
     assertEquals("String; optional; default is \"" + defaultValue + "\"", doc);
@@ -123,7 +121,7 @@ public class RuleDocumentationAttributeTest {
     Attribute attribute = Attribute.attr("bar_limit", Type.INTEGER)
         .value(defaultValue).build();
     RuleDocumentationAttribute attributeDoc = RuleDocumentationAttribute.create(
-        TestRule.class, "testrule", "", 0, NO_FLAGS);
+        TestRule.class, "testrule", "", 0, "", NO_FLAGS);
     attributeDoc.setAttribute(attribute);
     String doc = attributeDoc.getSynopsis();
     assertEquals("Integer; optional; default is " + defaultValue, doc);
@@ -136,7 +134,7 @@ public class RuleDocumentationAttributeTest {
         .allowedFileTypes()
         .build();
     RuleDocumentationAttribute attributeDoc = RuleDocumentationAttribute.create(
-        TestRule.class, "testrule", "", 0, NO_FLAGS);
+        TestRule.class, "testrule", "", 0, "", NO_FLAGS);
     attributeDoc.setAttribute(attribute);
     String doc = attributeDoc.getSynopsis();
     assertEquals("List of <a href=\"../build-ref.html#labels\">labels</a>; optional", doc);
@@ -149,7 +147,7 @@ public class RuleDocumentationAttributeTest {
         .allowedFileTypes(CppFileTypes.CPP_HEADER)
         .build();
     RuleDocumentationAttribute attributeDoc = RuleDocumentationAttribute.create(
-        TestRule.class, "testrule", "", 0, NO_FLAGS);
+        TestRule.class, "testrule", "", 0, "", NO_FLAGS);
     attributeDoc.setAttribute(attribute);
     String doc = attributeDoc.getSynopsis();
     assertEquals("<a href=\"../build-ref.html#labels\">Label</a>; required", doc);