From 8986b6e307a071ee8883afd0f1b6f2c4054ea17d Mon Sep 17 00:00:00 2001
From: ruperts <ruperts@google.com>
Date: Tue, 17 Oct 2017 00:26:29 +0200
Subject: Extend from an abstract base class to avoid duplication of utility
 methods in RuleErrorConsumers

RELNOTES: None.
PiperOrigin-RevId: 172387755
---
 .../build/lib/analysis/LocationExpanderTest.java   | 25 +++-------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'src/test/java/com/google/devtools/build/lib/analysis')

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
index a60cd7c01b..7fe406660d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
@@ -16,7 +16,7 @@ package com.google.devtools.build.lib.analysis;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
+import com.google.devtools.build.lib.packages.AbstractRuleErrorConsumer;
 import com.google.devtools.build.lib.packages.RuleErrorConsumer;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,8 @@ import org.junit.runners.JUnit4;
 /** Unit tests for {@link LocationExpander}. */
 @RunWith(JUnit4.class)
 public class LocationExpanderTest {
-  private static final class Capture implements RuleErrorConsumer {
+  private static final class Capture extends AbstractRuleErrorConsumer
+      implements RuleErrorConsumer {
     private final List<String> warnsOrErrors = new ArrayList<>();
 
     @Override
@@ -50,30 +51,10 @@ public class LocationExpanderTest {
       warnsOrErrors.add("ERROR-" + attrName + ": " + message);
     }
 
-    @Override
-    public RuleErrorException throwWithRuleError(String message) throws RuleErrorException {
-      ruleError(message);
-      throw new RuleErrorException();
-    }
-
-    @Override
-    public RuleErrorException throwWithAttributeError(String attrName, String message)
-        throws RuleErrorException {
-      attributeError(attrName, message);
-      throw new RuleErrorException();
-    }
-
     @Override
     public boolean hasErrors() {
       return !warnsOrErrors.isEmpty();
     }
-
-    @Override
-    public void assertNoErrors() throws RuleErrorException {
-      if (hasErrors()) {
-        throw new RuleErrorException();
-      }
-    }
   }
 
   private LocationExpander makeExpander(RuleErrorConsumer ruleErrorConsumer) throws Exception {
-- 
cgit v1.2.3