From 16aa79a82832085219b57197cb6a2855927962a7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Dec 2012 20:58:20 +0400 Subject: [PATCH] Removed dead code in NamespaceComparator. --- .../jet/test/util/NamespaceComparator.java | 81 +------------------ 1 file changed, 3 insertions(+), 78 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java index 2923076b722..cea741d5736 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java @@ -33,11 +33,12 @@ import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRendererBuilder; import org.jetbrains.jet.utils.Printer; import org.junit.Assert; -import org.junit.ComparisonFailure; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * @author Stepan Koltsov @@ -191,80 +192,4 @@ public class NamespaceComparator { printer.printlnWithNoIndent(); } } - - - private static > List sorted(Collection items) { - List r = new ArrayList(items); - Collections.sort(r); - return r; - } - - private static class DeferredAssertions { - private final List assertionFailures = Lists.newArrayList(); - - private void assertTrue(String message, Boolean b) { - try { - Assert.assertTrue(message, b); - } - catch (AssertionError e) { - assertionFailures.add(e); - } - } - - private void assertTrue(Boolean b) { - try { - Assert.assertTrue(b); - } - catch (AssertionError e) { - assertionFailures.add(e); - } - } - - private void assertNotNull(Object a) { - try { - Assert.assertNotNull(a); - } - catch (AssertionError e) { - assertionFailures.add(e); - } - } - - private void assertEquals(Object a, Object b) { - try { - Assert.assertEquals(a, b); - } - catch (AssertionError e) { - assertionFailures.add(e); - } - } - - private void assertEquals(String message, Object a, Object b) { - try { - Assert.assertEquals(message, a, b); - } - catch (AssertionError e) { - assertionFailures.add(e); - } - } - - public void throwFailures() { - StringBuilder expected = new StringBuilder(); - StringBuilder actual = new StringBuilder(); - for (AssertionError failure : assertionFailures) { - if (failure instanceof ComparisonFailure) { - ComparisonFailure comparisonFailure = (ComparisonFailure) failure; - expected.append(comparisonFailure.getExpected()); - actual.append(comparisonFailure.getActual()); - } - else { - throw failure; - } - } - Assert.assertEquals(expected.toString(), actual.toString()); - } - - public boolean failed() { - return !assertionFailures.isEmpty(); - } - } }