Changing default nullability for type arguments to NotNull

2012-12-07 16:34:36 +04:00
parent f09054d1a0
commit f925bfccd0
33 changed files with 107 additions and 56 deletions
@@ -17,6 +17,7 @@
 package org.jetbrains.jet.jvm.compiler;

 import com.intellij.openapi.util.Pair;
+import junit.framework.ComparisonFailure;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
@@ -51,8 +52,25 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
                tmpdir, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
        NamespaceDescriptor nsb = nsbAndBindingContext.first;

+        boolean fail = false;
+        try {
+            ExpectedLoadErrorsUtil.checkForLoadErrors(nsb, nsbAndBindingContext.second);
+        }
+        catch (ComparisonFailure e) {
+            // to let the next check run even if this one failed
+            System.err.println("Expected: " + e.getExpected());
+            System.err.println("Actual  : " + e.getActual());
+            e.printStackTrace();
+            fail = true;
+        }
+        catch (AssertionError e) {
+            e.printStackTrace();
+            fail = true;
+        }

        compareNamespaces(nsa, nsb, DONT_INCLUDE_METHODS_OF_OBJECT, txtFile);
-        ExpectedLoadErrorsUtil.checkForLoadErrors(nsb, nsbAndBindingContext.second);
+        if (fail) {
+            fail("See error above");
+        }
    }
 }