Fix PlatformInfo to correctly report all duplicate constraints, not just the first.

Change-Id: I3d78418d2c51d09e3862fbab1854ae73a0b3253c
PiperOrigin-RevId: 168889865

3 files changed, 31 insertions, 18 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
index bc49178d2e..76904e997d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD
@@ -26,6 +26,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/test/java/com/google/devtools/build/lib:analysis_testutil",
         "//src/test/java/com/google/devtools/build/lib:packages_testutil",
+        "//src/test/java/com/google/devtools/build/lib:testutil",
         "//src/test/java/com/google/devtools/build/lib/skylark:testutil",
         "//third_party:guava",
         "//third_party:guava-testlib",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
index a60ff1d4de..61b116c5ce 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
@@ -15,21 +15,19 @@
 package com.google.devtools.build.lib.analysis.platform;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
 
 import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** Tests of {@link PlatformInfo}. */
 @RunWith(JUnit4.class)
 public class PlatformInfoTest extends BuildViewTestCase {
-  @Rule public ExpectedException expectedException = ExpectedException.none();
 
   @Before
   public void createPlatform() throws Exception {
@@ -43,19 +41,32 @@ public class PlatformInfoTest extends BuildViewTestCase {
 
   @Test
   public void platformInfo_overlappingConstraintsError() throws Exception {
-    ConstraintSettingInfo setting = ConstraintSettingInfo.create(makeLabel("//constraint:basic"));
-
-    ConstraintValueInfo value1 = ConstraintValueInfo.create(setting, makeLabel("//constraint:foo"));
-    ConstraintValueInfo value2 = ConstraintValueInfo.create(setting, makeLabel("//constraint:bar"));
-
-    PlatformInfo.Builder builder =
-        PlatformInfo.builder().addConstraint(value1).addConstraint(value2);
-
-    expectedException.expect(PlatformInfo.DuplicateConstraintException.class);
-    expectedException.expectMessage(
-        "Duplicate constraint_values for constraint_setting //constraint:basic: "
-            + "//constraint:foo, //constraint:bar");
-    builder.build();
+    ConstraintSettingInfo setting1 = ConstraintSettingInfo.create(makeLabel("//constraint:basic"));
+    ConstraintSettingInfo setting2 =
+        ConstraintSettingInfo.create(makeLabel("//constraint:complex"));
+    ConstraintSettingInfo setting3 = ConstraintSettingInfo.create(makeLabel("//constraint:single"));
+
+    PlatformInfo.Builder builder = PlatformInfo.builder();
+
+    builder.addConstraint(ConstraintValueInfo.create(setting1, makeLabel("//constraint:value1")));
+    builder.addConstraint(ConstraintValueInfo.create(setting1, makeLabel("//constraint:value2")));
+
+    builder.addConstraint(ConstraintValueInfo.create(setting2, makeLabel("//constraint:value3")));
+    builder.addConstraint(ConstraintValueInfo.create(setting2, makeLabel("//constraint:value4")));
+    builder.addConstraint(ConstraintValueInfo.create(setting2, makeLabel("//constraint:value5")));
+
+    builder.addConstraint(ConstraintValueInfo.create(setting3, makeLabel("//constraint:value6")));
+
+    PlatformInfo.DuplicateConstraintException exception =
+        expectThrows(PlatformInfo.DuplicateConstraintException.class, () -> builder.build());
+    assertThat(exception)
+        .hasMessageThat()
+        .contains(
+            "Duplicate constraint_values detected: "
+                + "constraint_setting //constraint:basic has "
+                + "[//constraint:value1, //constraint:value2], "
+                + "constraint_setting //constraint:complex has "
+                + "[//constraint:value3, //constraint:value4, //constraint:value5]");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
index 8c71ae324b..52e9219b79 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
@@ -126,8 +126,9 @@ public class PlatformTest extends BuildViewTestCase {
     checkError(
         "constraint/overlap",
         "plat_overlap",
-        "Duplicate constraint_values for constraint_setting //constraint:basic: "
-            + "//constraint:foo, //constraint/overlap:bar",
+        "Duplicate constraint_values detected: "
+            + "constraint_setting //constraint:basic has "
+            + "[//constraint:foo, //constraint/overlap:bar]",
         "constraint_value(name = 'bar',",
         "    constraint_setting = '//constraint:basic',",
         "    )",