Skip to content

Commit bd0b344

Browse files
NanaOkadaSun
andauthored
fix flaky (#68)
Co-authored-by: Sun <ms19@fa21-cs527-067.cs.illinois.edu>
1 parent 912adde commit bd0b344

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

src/test/java/com/fasterxml/classmate/members/GhostTypeParameterInFieldTest.java

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.fasterxml.classmate.members;
22

3+
import java.util.Arrays;
4+
import java.util.Comparator;
35
import java.util.List;
46

57
import junit.framework.TestCase;
@@ -29,12 +31,18 @@ public void testGhostTypeParameterWithClass()
2931
MemberResolver memberResolver = new MemberResolver(resolver);
3032
ResolvedTypeWithMembers resolvedTypeWithMembers = memberResolver.resolve(resolvedType, null, null);
3133
ResolvedField[] fields = resolvedTypeWithMembers.getMemberFields();
34+
Arrays.sort(fields, new Comparator<ResolvedField>(){
35+
@Override
36+
public int compare(ResolvedField f1, ResolvedField f2) {
37+
return (f1.toString()).compareTo(f2.toString());
38+
}
39+
});
3240

3341
// test fields
3442
assertEquals(3, fields.length);
3543

3644
// field List<T> listOfT
37-
ResolvedField listOfT_Field = fields[0];
45+
ResolvedField listOfT_Field = fields[1];
3846
assertEquals("listOfT", listOfT_Field.getName());
3947
ResolvedType listOfT_Type = listOfT_Field.getType();
4048
assertEquals(List.class, listOfT_Type.getErasedType());
@@ -43,15 +51,15 @@ public void testGhostTypeParameterWithClass()
4351
assertEquals(Integer.class, listOfT_TypeParams.get(0).getErasedType());
4452

4553
// field t
46-
ResolvedField t_Field = fields[1];
54+
ResolvedField t_Field = fields[2];
4755
assertEquals("t", t_Field.getName());
4856
ResolvedType t_Type = t_Field.getType();
4957
assertEquals(Integer.class, t_Type.getErasedType());
5058
List<ResolvedType> t_TypeParams = t_Type.getTypeParameters();
5159
assertEquals("Expected 0 type parameter for t, got " + t_TypeParams.size() + ": " + t_TypeParams, 0, t_TypeParams.size());
5260

5361
// field i
54-
ResolvedField i_Field = fields[2];
62+
ResolvedField i_Field = fields[0];
5563
assertEquals("i", i_Field.getName());
5664
ResolvedType i_Type = i_Field.getType();
5765
assertEquals(Integer.class, i_Type.getErasedType());
@@ -66,12 +74,18 @@ public void testGhostTypeParameterWithInterface()
6674
MemberResolver memberResolver = new MemberResolver(resolver);
6775
ResolvedTypeWithMembers resolvedTypeWithMembers = memberResolver.resolve(resolvedType, null, null);
6876
ResolvedField[] fields = resolvedTypeWithMembers.getMemberFields();
77+
Arrays.sort(fields, new Comparator<ResolvedField>(){
78+
@Override
79+
public int compare(ResolvedField f1, ResolvedField f2) {
80+
return (f1.toString()).compareTo(f2.toString());
81+
}
82+
});
6983

7084
// test fields
7185
assertEquals(3, fields.length);
7286

7387
// field List<T> listOfT
74-
ResolvedField listOfT_Field = fields[0];
88+
ResolvedField listOfT_Field = fields[1];
7589
assertEquals("listOfT", listOfT_Field.getName());
7690
ResolvedType listOfT_Type = listOfT_Field.getType();
7791
assertEquals(List.class, listOfT_Type.getErasedType());
@@ -80,15 +94,15 @@ public void testGhostTypeParameterWithInterface()
8094
assertEquals(Integer.class, listOfT_TypeParams.get(0).getErasedType());
8195

8296
// field t
83-
ResolvedField t_Field = fields[1];
97+
ResolvedField t_Field = fields[2];
8498
assertEquals("t", t_Field.getName());
8599
ResolvedType t_Type = t_Field.getType();
86100
assertEquals(Integer.class, t_Type.getErasedType());
87101
List<ResolvedType> t_TypeParams = t_Type.getTypeParameters();
88102
assertEquals("Expected 0 type parameter for t, got " + t_TypeParams.size() + ": " + t_TypeParams, 0, t_TypeParams.size());
89103

90104
// field i
91-
ResolvedField i_Field = fields[2];
105+
ResolvedField i_Field = fields[0];
92106
assertEquals("i", i_Field.getName());
93107
ResolvedType i_Type = i_Field.getType();
94108
assertEquals(Number.class, i_Type.getErasedType());

0 commit comments

Comments
 (0)