azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added 'if not null' checks to avoid exceptions thrown before deferred assertions are printed.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-15 23:29:49 +04:00
parent 4620ba2fd3
commit 82b605508a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+7 -2
View File
@@ -23,6 +23,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.PropertyCodegen; import org.jetbrains.jet.codegen.PropertyCodegen;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
@@ -173,7 +174,9 @@ public class NamespaceComparator {
ClassifierDescriptor cb = nsb.getMemberScope().getClassifier(name); ClassifierDescriptor cb = nsb.getMemberScope().getClassifier(name);
deferred.assertTrue("Classifier not found in " + nsa + ": " + name, ca != null); deferred.assertTrue("Classifier not found in " + nsa + ": " + name, ca != null);
deferred.assertTrue("Classifier not found in " + nsb + ": " + name, cb != null); deferred.assertTrue("Classifier not found in " + nsb + ": " + name, cb != null);
compareClassifiers(ca, cb, sb); if (ca != null && cb != null) {
compareClassifiers(ca, cb, sb);
}
} }
for (Name name : sorted(objectNames)) { for (Name name : sorted(objectNames)) {
@@ -181,7 +184,9 @@ public class NamespaceComparator {
ClassifierDescriptor cb = nsb.getMemberScope().getObjectDescriptor(name); ClassifierDescriptor cb = nsb.getMemberScope().getObjectDescriptor(name);
deferred.assertTrue("Object not found in " + nsa + ": " + name, ca != null); deferred.assertTrue("Object not found in " + nsa + ": " + name, ca != null);
deferred.assertTrue("Object not found in " + nsb + ": " + name, cb != null); deferred.assertTrue("Object not found in " + nsb + ": " + name, cb != null);
compareClassifiers(ca, cb, sb); if (ca != null && cb != null) {
compareClassifiers(ca, cb, sb);
}
} }
for (Name name : sorted(propertyNames)) { for (Name name : sorted(propertyNames)) {