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

sort members in Read*BinaryClassTest

Browse Source 
test should not fail if hash code or hash set is implemented diffently
This commit is contained in:
Stepan Koltsov
2012-05-23 02:52:31 +04:00
parent 3c64fbb2a0
commit 13a9108f05
9 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java
+9 -3
View File
@@ -71,6 +71,12 @@ class NamespaceComparator {
}
}
private static <T extends Comparable<T>> List<T> sorted(Collection<T> items) {
List<T> r = new ArrayList<T>(items);
Collections.sort(r);
return r;
}
private String doCompareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb) {
StringBuilder sb = new StringBuilder();
Assert.assertEquals(nsa.getName(), nsb.getName());
@@ -98,7 +104,7 @@ class NamespaceComparator {
}
}
for (String name : classifierNames) {
for (String name : sorted(classifierNames)) {
ClassifierDescriptor ca = nsa.getMemberScope().getClassifier(name);
ClassifierDescriptor cb = nsb.getMemberScope().getClassifier(name);
Assert.assertTrue(ca != null);
@@ -106,7 +112,7 @@ class NamespaceComparator {
compareClassifiers(ca, cb, sb);
}
for (String name : propertyNames) {
for (String name : sorted(propertyNames)) {
Set<VariableDescriptor> pa = nsa.getMemberScope().getProperties(name);
Set<VariableDescriptor> pb = nsb.getMemberScope().getProperties(name);
compareDeclarationSets(pa, pb, sb);
@@ -115,7 +121,7 @@ class NamespaceComparator {
Assert.assertTrue(nsb.getMemberScope().getFunctions(PropertyCodegen.setterName(name)).isEmpty());
}
for (String name : functionNames) {
for (String name : sorted(functionNames)) {
Set<FunctionDescriptor> fa = nsa.getMemberScope().getFunctions(name);
Set<FunctionDescriptor> fb = nsb.getMemberScope().getFunctions(name);
compareDeclarationSets(fa, fb, sb);