From 5ef6cdb13d8e5023445fb141414a9586c25b6a2a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sat, 23 May 2015 19:40:30 +0200
Subject: [PATCH] java: .class file tests cleanup

- meaningful ClsRepositoryUseTest cases moved to ClsPsiTest
- related test data grouped under a single directory
- obsolete test data dropped
---
 .../1_TestClass.class}                        | Bin
 .../2_TestClass.class}                        | Bin
 .../KeywordAnnotatedClass.class               | Bin
 .../cls => cls/repo}/pack/Annotated.class     | Bin
 .../cls => cls/repo}/pack/Annotation.class    | Bin
 .../cls => cls/repo}/pack/Annotation2.class   | Bin
 .../cls => cls/repo}/pack/Modifiers.class     | Bin
 .../cls => cls/repo}/pack/MyClass$Inner.class | Bin
 .../cls => cls/repo}/pack/MyClass.class       | Bin
 .../cls => cls/repo}/pack/MyEnum.class        | Bin
 .../repositoryUse/cls/java/lang/Boolean.class | Bin 607 -> 0 bytes
 .../repositoryUse/cls/java/lang/Byte.class    | Bin 1345 -> 0 bytes
 .../cls/java/lang/Character$Subset.class      | Bin 330 -> 0 bytes
 .../java/lang/Character$UnicodeBlock.class    | Bin 2563 -> 0 bytes
 .../cls/java/lang/Character.class             | Bin 4028 -> 0 bytes
 .../repositoryUse/cls/java/lang/Class.class   | Bin 2374 -> 0 bytes
 .../cls/java/lang/ClassLoader.class           | Bin 1856 -> 0 bytes
 .../cls/java/lang/Comparable.class            | Bin 235 -> 0 bytes
 .../repositoryUse/cls/java/lang/Double.class  | Bin 1554 -> 0 bytes
 .../repositoryUse/cls/java/lang/Enum.class    | Bin 1173 -> 0 bytes
 .../repositoryUse/cls/java/lang/Float.class   | Bin 1487 -> 0 bytes
 .../repositoryUse/cls/java/lang/Integer.class | Bin 1573 -> 0 bytes
 .../cls/java/lang/Iterable.class              | Bin 264 -> 0 bytes
 .../repositoryUse/cls/java/lang/Long.class    | Bin 1586 -> 0 bytes
 .../repositoryUse/cls/java/lang/Object.class  | Bin 560 -> 0 bytes
 .../repositoryUse/cls/java/lang/Short.class   | Bin 1355 -> 0 bytes
 .../cls/java/lang/SimpleIterator.class        | Bin 260 -> 0 bytes
 .../repositoryUse/cls/java/lang/String.class  | Bin 2732 -> 0 bytes
 .../cls/java/lang/ThreadLocal.class           | Bin 338 -> 0 bytes
 .../repositoryUse/cls/java/lang/Void.class    | Bin 215 -> 0 bytes
 .../cls/java/lang/ref/PhantomReference.class  | Bin 385 -> 0 bytes
 .../cls/java/lang/ref/Reference.class         | Bin 468 -> 0 bytes
 .../cls/java/lang/ref/ReferenceQueue.class    | Bin 516 -> 0 bytes
 .../cls/java/lang/ref/SoftReference.class     | Bin 428 -> 0 bytes
 .../cls/java/lang/ref/WeakReference.class     | Bin 375 -> 0 bytes
 .../java/lang/reflect/AccessibleObject.class  | Bin 332 -> 0 bytes
 .../cls/java/lang/reflect/Array.class         | Bin 1640 -> 0 bytes
 .../cls/java/lang/reflect/Constructor.class   | Bin 1037 -> 0 bytes
 .../cls/java/lang/reflect/Field.class         | Bin 1539 -> 0 bytes
 .../java/lang/reflect/InvocationHandler.class | Bin 284 -> 0 bytes
 .../reflect/InvocationTargetException.class   | Bin 337 -> 0 bytes
 .../cls/java/lang/reflect/Member.class        | Bin 313 -> 0 bytes
 .../cls/java/lang/reflect/Method.class        | Bin 807 -> 0 bytes
 .../cls/java/lang/reflect/Modifier.class      | Bin 834 -> 0 bytes
 .../cls/java/lang/reflect/Proxy.class         | Bin 698 -> 0 bytes
 .../java/lang/reflect/ReflectPermission.class | Bin 237 -> 0 bytes
 .../UndeclaredThrowableException.class        | Bin 340 -> 0 bytes
 .../cls/java/text/MessageFormat$Field.class   | Bin 425 -> 0 bytes
 .../cls/java/text/MessageFormat.class         | Bin 1457 -> 0 bytes
 .../cls/java/util/AbstractCollection.class    | Bin 1103 -> 0 bytes
 .../cls/java/util/AbstractList.class          | Bin 1348 -> 0 bytes
 .../cls/java/util/AbstractMap.class           | Bin 1106 -> 0 bytes
 .../java/util/AbstractSequentialList.class    | Bin 718 -> 0 bytes
 .../cls/java/util/AbstractSet.class           | Bin 422 -> 0 bytes
 .../cls/java/util/ArrayList.class             | Bin 1329 -> 0 bytes
 .../repositoryUse/cls/java/util/Arrays.class  | Bin 1993 -> 0 bytes
 .../cls/java/util/Collection.class            | Bin 841 -> 0 bytes
 .../cls/java/util/Collections.class           | Bin 4895 -> 0 bytes
 .../cls/java/util/Comparator.class            | Bin 295 -> 0 bytes
 .../cls/java/util/Dictionary.class            | Bin 627 -> 0 bytes
 .../cls/java/util/Enumeration.class           | Bin 269 -> 0 bytes
 .../repositoryUse/cls/java/util/HashMap.class | Bin 1163 -> 0 bytes
 .../repositoryUse/cls/java/util/HashSet.class | Bin 744 -> 0 bytes
 .../cls/java/util/Hashtable.class             | Bin 1408 -> 0 bytes
 .../cls/java/util/IdentityHashMap.class       | Bin 1154 -> 0 bytes
 .../cls/java/util/Iterator.class              | Bin 334 -> 0 bytes
 .../cls/java/util/LinkedHashMap.class         | Bin 643 -> 0 bytes
 .../cls/java/util/LinkedHashSet.class         | Bin 457 -> 0 bytes
 .../cls/java/util/LinkedList.class            | Bin 1485 -> 0 bytes
 .../repositoryUse/cls/java/util/List.class    | Bin 1425 -> 0 bytes
 .../cls/java/util/ListIterator.class          | Bin 506 -> 0 bytes
 .../cls/java/util/Map$Entry.class             | Bin 480 -> 0 bytes
 .../psi/repositoryUse/cls/java/util/Map.class | Bin 947 -> 0 bytes
 .../psi/repositoryUse/cls/java/util/Set.class | Bin 829 -> 0 bytes
 .../cls/java/util/SortedMap.class             | Bin 669 -> 0 bytes
 .../cls/java/util/SortedSet.class             | Bin 634 -> 0 bytes
 .../repositoryUse/cls/java/util/Stack.class   | Bin 406 -> 0 bytes
 .../repositoryUse/cls/java/util/TreeMap.class | Bin 1642 -> 0 bytes
 .../repositoryUse/cls/java/util/TreeSet.class | Bin 1439 -> 0 bytes
 .../repositoryUse/cls/java/util/Vector.class  | Bin 2551 -> 0 bytes
 .../cls/java/util/WeakHashMap.class           | Bin 989 -> 0 bytes
 .../cls/java/util/jar/JarFile.class           | Bin 785 -> 0 bytes
 .../cls/java/util/logging/LogManager.class    | Bin 790 -> 0 bytes
 .../repositoryUse/cls/pack/Parametrized.class | Bin 344 -> 0 bytes
 .../psi/repositoryUse/cls/pack/Variance.class | Bin 753 -> 0 bytes
 .../cls/src/pack/Annotation2.java             |  11 -
 .../repositoryUse/cls/src/pack/MyClass.java   |  23 -
 .../cls/src/pack/Parametrized.java            |   7 -
 .../repositoryUse/cls/src/pack/Variance.java  |  12 -
 .../cls/sun/reflect/LangReflectAccess.class   | Bin 1429 -> 0 bytes
 .../sun/security/util/SecurityConstants.class | Bin 1757 -> 0 bytes
 .../roots/impl/ProjectLibrariesTest.java      | 117 ++-
 .../com/intellij/psi/ClsBuilderTest.java      |   2 +-
 .../testSrc/com/intellij/psi/ClsPsiTest.java  | 341 +++++++-
 .../intellij/psi/ClsRepositoryUseTest.java    | 759 ------------------
 .../impl/ClassFileUnderSourceRootTest.java    |  55 +-
 96 files changed, 413 insertions(+), 914 deletions(-)
 rename java/java-tests/testData/psi/cls/{1/TestClass.class => repo/1_TestClass.class} (100%)
 rename java/java-tests/testData/psi/cls/{2/TestClass.class => repo/2_TestClass.class} (100%)
 rename java/java-tests/testData/psi/cls/{tree => repo}/KeywordAnnotatedClass.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/Annotated.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/Annotation.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/Annotation2.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/Modifiers.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/MyClass$Inner.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/MyClass.class (100%)
 rename java/java-tests/testData/psi/{repositoryUse/cls => cls/repo}/pack/MyEnum.class (100%)
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Boolean.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Byte.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character$Subset.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character$UnicodeBlock.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Class.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ClassLoader.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Comparable.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Double.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Enum.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Float.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Integer.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Iterable.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Long.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Object.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Short.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/SimpleIterator.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/String.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ThreadLocal.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/Void.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/PhantomReference.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/Reference.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/ReferenceQueue.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/SoftReference.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/WeakReference.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/AccessibleObject.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Array.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Constructor.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Field.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/InvocationHandler.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/InvocationTargetException.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Member.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Method.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Modifier.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Proxy.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/ReflectPermission.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/UndeclaredThrowableException.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/text/MessageFormat$Field.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/text/MessageFormat.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractCollection.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractList.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractSequentialList.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractSet.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/ArrayList.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Arrays.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Collection.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Collections.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Comparator.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Dictionary.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Enumeration.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/HashMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/HashSet.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Hashtable.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/IdentityHashMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Iterator.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedHashMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedHashSet.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedList.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/List.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/ListIterator.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Map$Entry.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Map.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Set.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/SortedMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/SortedSet.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Stack.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/TreeMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/TreeSet.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/Vector.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/WeakHashMap.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/jar/JarFile.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/java/util/logging/LogManager.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/pack/Parametrized.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/pack/Variance.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/src/pack/Annotation2.java
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/src/pack/MyClass.java
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/src/pack/Parametrized.java
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/src/pack/Variance.java
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/sun/reflect/LangReflectAccess.class
 delete mode 100644 java/java-tests/testData/psi/repositoryUse/cls/sun/security/util/SecurityConstants.class
 delete mode 100644 java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java

diff --git a/java/java-tests/testData/psi/cls/1/TestClass.class b/java/java-tests/testData/psi/cls/repo/1_TestClass.class
similarity index 100%
rename from java/java-tests/testData/psi/cls/1/TestClass.class
rename to java/java-tests/testData/psi/cls/repo/1_TestClass.class
diff --git a/java/java-tests/testData/psi/cls/2/TestClass.class b/java/java-tests/testData/psi/cls/repo/2_TestClass.class
similarity index 100%
rename from java/java-tests/testData/psi/cls/2/TestClass.class
rename to java/java-tests/testData/psi/cls/repo/2_TestClass.class
diff --git a/java/java-tests/testData/psi/cls/tree/KeywordAnnotatedClass.class b/java/java-tests/testData/psi/cls/repo/KeywordAnnotatedClass.class
similarity index 100%
rename from java/java-tests/testData/psi/cls/tree/KeywordAnnotatedClass.class
rename to java/java-tests/testData/psi/cls/repo/KeywordAnnotatedClass.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/Annotated.class b/java/java-tests/testData/psi/cls/repo/pack/Annotated.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/Annotated.class
rename to java/java-tests/testData/psi/cls/repo/pack/Annotated.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/Annotation.class b/java/java-tests/testData/psi/cls/repo/pack/Annotation.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/Annotation.class
rename to java/java-tests/testData/psi/cls/repo/pack/Annotation.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/Annotation2.class b/java/java-tests/testData/psi/cls/repo/pack/Annotation2.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/Annotation2.class
rename to java/java-tests/testData/psi/cls/repo/pack/Annotation2.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/Modifiers.class b/java/java-tests/testData/psi/cls/repo/pack/Modifiers.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/Modifiers.class
rename to java/java-tests/testData/psi/cls/repo/pack/Modifiers.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/MyClass$Inner.class b/java/java-tests/testData/psi/cls/repo/pack/MyClass$Inner.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/MyClass$Inner.class
rename to java/java-tests/testData/psi/cls/repo/pack/MyClass$Inner.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/MyClass.class b/java/java-tests/testData/psi/cls/repo/pack/MyClass.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/MyClass.class
rename to java/java-tests/testData/psi/cls/repo/pack/MyClass.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/MyEnum.class b/java/java-tests/testData/psi/cls/repo/pack/MyEnum.class
similarity index 100%
rename from java/java-tests/testData/psi/repositoryUse/cls/pack/MyEnum.class
rename to java/java-tests/testData/psi/cls/repo/pack/MyEnum.class
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Boolean.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Boolean.class
deleted file mode 100644
index 05d27b08b8c31c2821c7d62a52ed0de0a1e86740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 607
zcmZ`$%TB^T6g|VMyi|~f;(KS=h^{dvN+dBM!B`}b-GBp>Oj>OV3qQ?;AK*tB@3ak6
z#Wc<7J#*&Vb8kPt-ai1G<3z)uh9eEf42j;u<1Is}Gvf>1kldOyZfsi$ZZ#Q_?dy&~
zr-|OvJwY)dYDw<8BuQPGmg!xQMjzDs3>7^hGCaq$CQZfXU%2Cn(E1<QfMmm<d7sO<
zV2JB=BDIC8x?_eaHHrAIlAf+>yH=U@>>!p3@xv`l%TU&%O_p?e%H3(pehzZo(d^=N
z&ZYZnn(lBWMqX0|&rXE5964*)b7v&lrX+)WNS~>-(`Nr{pP{hg0!s?!Q>NW8gky4P
zzVV?HxBx?p-Z(uqB#@+^Ttg~E4QZ-#be=($z7*yNGst7ZuQ##f*98<q-1f1AvVUGe
V#m6dkeB32>b$>6szfV;R2j5VRjS2t&

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Byte.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Byte.class
deleted file mode 100644
index 2a30d250bbbce6b12f2b40ae10fa11cb7463a635..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1345
zcmZ`&TT|0e5dKbEDJ}PlDBe&3Z9%zsmjX&F%-~dTrr1$moYOY6VM2mQ%D|KUAfJ8k
z!SUH2C4T25(opI{&St;;cK18G$?rcuegarPK8cky1Xh!Hk;F@Z)SJz%Pvy1ZyLADP
z7w9WEw&zRRFH5Uw#7|C6zADn%`+yW@l`jH`oeyuBFjU-=hjQMMc748JNzcoXTQcjm
z^qa0BFxehojsW>%-^i^pquX~%zH8cbfs2`ZHbMztQj&*C&GxRq$XSLi!lnn(^$g{x
z8s{ryd9(ETQPnu`P2MkwHG#1XyiG-%?ih#^4VzAN;6>Gkw62;_b!rsWwQSm^zsl+H
z4(0y{C7!DA9(w!&@r;)4H5@nCh=xiWni;N01DnjU9J}7idd&;(T8@llZ3y(#oMy#}
z6n`Z!nu&@&9eH;{dW}LL-1yv-me;0uyRv6g{ap4Vdsm%(Zot@a)PmY4m8H5fOZk^c
zJP~vlD4Mph)!eTb?vA8Df#IT4l~!50rt(8D;Wtdm7;Nt#5Ib5>Ijzqz>_Kg%W7}^S
zzFFl4@~&B{v-(nm8MMtskb=IA>f7;qO_!XeTQxRJr8A|rJg52!^tak8v=?)jr`i@8
zwBpEHP^*`~L<<g>8;-j#{nPIji~Murd=fmzaRFU?Px6n9p__gx;-~5NpqKGJ9q-2|
z;{zC^m%<Q+wH+bK-S9m@JI2TeF0~;;xO@&7Z$qxITeObARa|3LWv{nIZeT)3ZsL}<
zw=t>h6sEPkgS*;hkkxhoGuqCEynDE>ea;pb6rAw_r?E(Eg>#6}re<b;L3~H-8=V*)
m@Kl2WX%Bgh1tdJeV|r>FPw<rSXWDzN&saFNCFJPGu>2RDmny^n

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character$Subset.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character$Subset.class
deleted file mode 100644
index b4c03105cf6f343fe95e53b7df0ddfd8b9ee04f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmZXQPiw+J5XIk^*2MT<>&084hvZUwSG)uYLZOF%hu+q>m`K>*?#2)2!4J?6Rh&jN
z(6Y?FVfMY@$A15u&H&ypcF}V&Bs3S9%IuOb2|o7XC}z1(yIE{?rgrmi%?5cWMQ;8W
zJ~w-r*m?Lx@KRyYsMtz^6ND=s*y5TeJO$zZtpq<VN}b5}Eay-!N`)4QmHPD;z{Q9#
ztx@i;FLAjs(lXJl>8zBJI?9DHk^u*G=!!=e*Q5I$JcH2SUjQEXI9$LGk7!ov!mG3e
TpS6K@b$2je^*KrCqL0=E$pTI~

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character$UnicodeBlock.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character$UnicodeBlock.class
deleted file mode 100644
index 7de10cebeed575020f9a0017fd0b4961fd3ab08e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2563
zcmai#X;<7f6ozGzVTO<bfoz1(q%>)hE?K&_q-kYaV~dd`SC)b4rcTHtrRBgmK>FkQ
zp+BHMs;93!m#vV~4>ON!U0+G>UG(=qfBwZ7d&FL}*)MIj5wXdbS2FR6JE<eKq<$Ox
zF?hH&*nasi`E{^6*w`QL-l?}YH+G&6<E@>I-<Kmc+Zg-DzN*Voi9%=>v6<0JvF?OU
zMe6zKS8>FqWXXMFQ%R$%h+VHro=Bbf!lbe*h4o4}CoHBG5>v!dhsjj(#7ZX<u6)65
z53{Yz3ek&LC+S<MluR(>7JHE#=NQjLY{eP|-10a~UP#3%*F57^MywqRopFUxC#!8y
z_wvzj1=bG3ma(#r6SN#Jq=FYGRGroMu*bFLDW)b0u6Q56B4X!V&hgbb#SKiHjD-uE
z=w!m!tl7_G&UIERzrqWc%>P%bG{xbJ=2&W~IoC)d=oqoNOlV<o@Uqs4tFb==-wV(l
zDnXUfRi5h<!HDS*$|tq8LMMG+^^4f3lWH~!`mV7@v$G@BmF$V5mlt(i#E1wi3wVH(
z)~sQ0wcsun_-o=}un+D`h}gA4R*6uGYhmijJCWo%*n|xk?X1BeB+g(3j2BHga**Uu
zJweR96^Y4oBL!B${*|dhDyb6k)rGJ!!H1KvS@)^sYsd`f6)ThUycp#nre~mfAslRd
zmGd$zb>-x~4mIhda1nC{lZ9lZcX0AX&J${Pa%qt|8gcLRxZ}uzFpN!U3eyb{rT8Lc
zOXw0yC0(DQJr3)*M$B#<o+vCvdEP8mK%E@BxD+N%_<#=KU9CfLq+X`NWR{n~c!t)j
z`cOPp;h@tM;%+kT1aiU(>~W^Fauv_Mt^~chd1{dpZWkN5k-`wLM5IvNP0k&p!NRDb
z&X@}|fBC3rbFR7v)q3spnv_*@6$(i;&iyKilj|lNuU`aRWHGp2lc~!a^}4lEqbKs&
zsY;PZ9@2iiLVMt-|8dl46Sa0FHNMAQ+eM#i6aykDTrLfA6T>7I*7Ssk*xduw6MTpk
zq&<((7&3`MMXm(Zn}lqcEDvp<W$^)Aw0b#mHM9t$GozXYFcVvjHYGgL1F0TbU!#eI
zV^m0WqL)r1W3qMW4<^x<4+D>=q+(R)XaxSSc;N8TK|UVq9!qCu&ruH!LA%(Obe<-Q
zCh>T*^!Ss_?alqCsG@tvE{AG=cXRvY^8M9_jqSXER`-(o$EII<cU-7;UhQrSyPI1>
z)b63#gK+J%8Q$IgzY7T4J$@hIQEqP!cayEb-rjI8VmHomP`!G#H{1{DK!dq6tk`3Q
z)8Kln**rVP&SNysTEuZ;o7f>v5HAoXi5H1)5T}UK#2Mlx;w*8Fc$s*Gc$IjKc%3*;
zyg^(b-Xty(-z455-X^|9Tq3?ryhFT8e24fh@gDI$@jc@E#1Duc5+4vB5+4yC6F(w;
zO#FoSDe*Jn=fp3FUlP9}E)$;+za~B<enb40$cZsAA*Mt@>=H9#PL#wIVvneZ1yK_X
zu_S&+w8V<&h&6GQxJF!WIEH-fv+t3q6YK}}BRIx>YW{y_&%jwcN6fPUGI<Pq&L;i^
D)C>FD

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Character.class
deleted file mode 100644
index 155067c1deecf9ed78ff450320e44c3a427dc238..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4028
zcmai1X?xU060Y{aFt)*9Fkk|N<%$gnklkdDK-g$BvMrdA21#QuITU#;+k#<aG%^X<
zJ9{R3pKOlZTzfCc$9%|#Jo%g-74o*E8P~|(EYHJKy>C}nS9euc%b$Ms(Z@t|mOd!Z
zKZi)rzY6s40{y2z|1HoxK_m56&<Gd(QZsDa0MuJ8KT?}syY06N^uC}i_S!<*j|CO0
zy5U+%S-&bs=z_MXVXGZ`t$5CBuKE2~q)!?tS5qTN9Lr|SDV4g0S*j!vLt>SXAnxB6
zG~mqFV6d}t-Mj6bX?m^YGf52R1P#><#kTbsLo35WNzjgZt)^M3Vry<ia~#c*P6hai
zd8LO3<>*dD%bE5I8m*dTeOlKn=3xMvH=WrYZV)aE({SyYqUy$sTUD$}a<wgjwrhr3
zF>THk1np7HYDqUFo1e2)(C)IP>Q$xUmh~CkagBPllty2~X{LK&<WM)Db;DuAE*)#G
zt<@Auam-}*BZ#M>8##8Hpk2~v#!_mty%V+zDyXL6SY}1;XB26kHm$1SNVG%HaLv-^
z6i0LGwkD}D<jk&HmN^4b61#9RWyPL#Yjs0)>WZVAhU9l6iMFFyPJUn<k!wadPwx>l
zjzA1e#a8lzd*LiiNp6*Wh!DYIQ}fkQx`he&R}mr7GSBG!JlX5k4|LCVojV|C0;zL!
zB<OP8#O8CW9u%~9S~vdJ@F79_%DRP};4GAi?##P&qpV?uR_?!#e}WF=#w*&i<2t5m
z=`*v=#^HpP<I+yh(cJ8wVHb%m>8hYZIV-JhnKex@vdR)P`Nan7g(7I`|Cr+Pp()5J
z+!%ZsPj}T5IajzSRotw!wE3F(_;LUERTA`I&Qr<6F)P-*YiM=HQYwOu<SaJ11cDCd
zjBIVDsu>OsWg=&CWmb2z<oXFZm>Wy$Gz-BNl;3Yps$C5?zg$L}5Oh4}sMpY((=1Cb
zqc`Rq_GbSJ9QGP^9LmeObK~kYvxe@}En+wA3TO}KgH{k<K&PHmr{>T-Zp)@`E}`Z@
z@V33;MP4KJBed>f10Z=F1ocl&p*Xj$c<mJx&rL$$5!vG3TJxH1bb(3c#9X-UH{x?s
z*Dxav?Klcr%V?jIe4&)ZD&xHYbot?+T?t>nW9GH7oQxapK-O1RJ0y@3#7#dnDFp3u
zupG#z4w}CdwERT`05^V&4WW~CR5Qv9M}qc6yjUHBT^x3e##2^b^jmST6!?)Hdl6RI
zo#$%_y$>O#Z}Ns2dp8+MCt;0sYkj#DM&3db+a8X?+#w(fAo(H0Av=V@#q<aUCsln4
z2^wAYV`J^69|esplky}nfYY*9y@p&P(^O;|eKlxbSqWmloel!(wuw)LI0~DX1$WM!
zRm|GD6n0K=a8lQ0b?n4oIf#(@AZ&TfAik644Uhg%(5?ni6h<;7#YT8@)r)*5l;y|j
zMn;eppNw$Rk^(=F7T{<F3C7kI{K!cUYpfDByyl!21rlfEK)e#j`rLFGL47Zt6*R^M
zv)Yvp=ABl&;>SS)WnPMc#bxZeXa~zJFJ6nF*Eh~enIJr4<G^tOFUdg8F*`Ncxn$3C
zw!7~O@{7q1*P@0$9moRM-aV7k^4kiZ1nd*5Gi`+K(x367uMefWK#e9;E}#ybey4RK
zLQh?H&|UUe?+51o%}mlyOnMZbhW*q>12jlqqX`<O5ir}(srqO;@F>GOfOpbZcYGJ{
zZidH!_t0L<ouGaA-|-{u_A~qd^aBjbbq+Fo2>OEzABO%VhL1o$%J4Dh#~D5W{UL@Y
zp-(Y<68b5IABO%2!>6I2VfZZcM;ZPy^sg}d81%;({wj2NmYw~79r`yIeggVAhR;KP
zlHm)`zsc}Z&=rPD&{c-Z&^3mqq0cZp3teaUBJ@iPSD;rJHlUjf*Pvf!*n(~|>_D$G
zEb~3bu*~-rhGo95GA#2w&#=t*HHKxrpJrI*`x%C1zMo}S=KDE@Wxid8Wxk(hSmxVf
zSmt|yVVUm+!!qBC49k4`49k2kF}w_Yh2baY7-}P+>$oXJx<O4yK{u(D$dFbOd5fY%
zwkd`zQk&Kid7EBH<cpcSlgXDd`K?TTJConZ<aaaqy-a>TlRwDh%bEOPCV!O4AJb2g
z^?sVkpJnnDdNtvHPQOUxFEjgJW%AdV{7oi*o7w%2exKO?f&Q4tKPBTrw!`G_pu6-M
zI@0SHdlEgUPuiS3^$Cd&sqY>@AH9L!EjTcO*_-&?lN!-q=&wNXsNSNtG5$`1-c5e{
c={?9k`WyW{k^i8rkYiw^rvj2wgdC#c=RhbwVE_OC

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Class.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Class.class
deleted file mode 100644
index b5d94add03bf6ec09421bcc4e3c1b4b0153688c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2374
zcmb7FTYD2X5FK&bTqw6fD5YEq4cLWXT6&>4xP%0^p-D)yh6nm2b`>L7ul#9c+VrRO
zp+BHMs$Y+!wO78-uYK@0^5~q=nbBzWufPBJlZfupi-@)(+KK2HqhqTwm!`$&aIOA=
z(VS7S(K7EcI$Nu6z2Wb8Bjb6u;k`{p(Z13<yeAkf*QWPF%6i6&0*r+xza^q?q{@qk
zb{RdK!Fw5ma=b0YQ=yx);w|Rl*Uh{zJWrrvT;{V^Z$x665&ay|9;5kKc5`k98o;Bq
zdZ%OM$f9DO3$>Kw`b$QqWU*Ehmi#IcZLNCtph=BQi(ItfjL`esszDXui@?^JAGqCJ
zEql_)ci4@(!uZ;qz$(a-(S@;U2U}450l@K~FLYun%IL#stj!CkU7oz<U7U1o3{tww
zP$Rhrh3fq>l@`*s@>H*{a*><PK_3y1!?mqaxi5tV5s7a4Gi`~T3ulJ0%4#w?4d#Y`
zcH37jGf#9&fmrhZw57;WtUnnKqQ!oO3vIY<Tx;y9+rqq77Jg|q-0vgblP(c7iykCK
zS>e}aGuF|aB?z<{K(~Ur3}pnURWwrz(7B;_Mk`^5ln*9s;9-<uG990~7t83;40>2l
zSFf=bF$`Fy8_{z{uCuCS7~QM=w;(}oNbCOpXALWIW^~^o9o=!&1R@>YbqE~Y==qRc
z<$;^CP3iln3=y`LNQY%y3SdD_csAJB6NMV+M64CKAHngg>ocleUYb;m&AdM_9*UwY
z1`%v01syVe-MKK0=X+bA*h6=<GH7B9zzx;oGIverxrImuTAG8#BnH%_R1{K+6oW`;
z%Z?3384A%_?K}vME+1NJ+T}e+BNkfnO#W`C86q#lt_W?J;bAYhJGx^>J>E+-@tqr0
zuRQ)B3=QX+2+Qbdg>>8<W!h?xr=#&d2Jti4NNzKG4<yS(muG89B8nn_T&xa?%lZYo
zm#f_!6%UfvuH6E_l}Ui_oDqV)AV!DqJB+X8GFC_EC|3AZQUp6sbNHcdSRa91be`j5
z9?Wby0j9+qgFQ*7=rq=c=nO+o&{>4TkftSP&(lZFUMTIyrM>9R!%U=0ZvQe}K@3!p
zK6U@E(RF7(vwp-|rW?-Qq?)t!692iyfp?2;2P#*vzC(=(&s}8ib=%xlO4VOteUH8>
zu{NWxvB&5e`Zn<0cfRlFK^ei~tj}lO1acKhs><0252rM>rZj#3UQLf?Xj+@0>G8j4
eTBi+HohQ_G_6PdW*-d*3$iS<AN<X=OTmJy&4Qqt}

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ClassLoader.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ClassLoader.class
deleted file mode 100644
index a063243893e66dda6da47976bebe937de9d4ed5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1856
zcmcIlTTc@~6#fQQYYPa40)kgipcQ4k--;$6kThw8(C7m^4P|H+x4UF^mdMZXZ}{L3
z@JAWXOt*B}T^@a)C;Of6+|L~T{QdPCz%zWz;cX7@7_P5-fu}w(%$Mt@{G7W!4_fYL
zpGQ$W<i|o*E8iG~%lbF(6Jk^hOE$fsq!+ZRl|c_xhQjubrZ`hx7(_X|XIRd#JIFH3
zpLjtx*vPS<FOh_vEgx>yYH6DsJ}^`={Abe{YFBVOWkjMGOHW<6doom_sY}=j+uRE>
z>l~FL3jOnLjwRc*$=mdCTo={2h?Hn2#TdkNx?5}^5~|^~0wE)Ym9(EjtINAbr<9p-
zJ<<|tpK^$0Q!p&rcKzcCgmS;`*J(DRmI=jLz1k*Lp6_l4aa%~P8&S<c+v{q2F~{sr
z@>eAHomzXG$rMJ!DJzeSh_V&Doju89=w9g7g0on4sFcZE%5Be2o^*R$ia-&soLZY?
z%Na_SKFnx3IKx<H_x5=6J8w~Ee`a*ann=>?|BZBqXqS_uNV8d|cW0_ja_-xr{%tVN
zy=%#!w<!6d!OWB^_O@9xJ?gr5B)PoEe$#ehNknQtt@f5U;jynaqDV-+N)5$TOtGBu
zfxa=ClEg_-W-?lDjAqHm3@v3+YWjl96kKSSce3O8G|>rb-fQ{>GE8TlLZbHY&eLOf
z(1VPhFQM8A<KX!6?$K!-pzMUQ&DFM)p`_(EO1;s$mdRqzq~`mg#r+N0qURT=OOmqy
zh9SD<z&$t^rau^YjU*j*<mmT?!RU135g~;>#KFh_r-V_AS)7~D$ao5w7(j}cq&Ou^
z_4{Kb!g5A4jTw{GEN+o3Vh;0`kK2^@9iwq@cR-V;>a<NB_Xjl8dn_2uqLD>Bq$)LY
w$w&vwSh1p%DM|&8iQ!-sPmFwuHIfT(>3^b@&+)>@mx+9ZPB&i@I)pd>03s9kDgXcg

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Comparable.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Comparable.class
deleted file mode 100644
index 18539eceb4c0831892dd5dd1710047a17b549850..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmX^0Z`VEs1_lEL9(D#Ub_Q-n2F~RC+=9fS)R25e22l;4ti-ZJ{hY+SbbbG%tkmQZ
zYfVp}n&8azyu^~yqEto(HjR)Fu%L!bh!v)CJ4_))2Cm@z(xT*4x6B-%0sPKj3lo!a
zQuRQ#F*1lCEJesMG6*1qA#Pz~WME`q0y>|8fsuugfti5?$Y%xem>AfA7{X#_-~fwo
F0sxr-ImQ40

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Double.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Double.class
deleted file mode 100644
index 9e1ecbed60bb231eaa30b275984ab0371cfa0f8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1554
zcmZ`(OIOoC6uwhRA0S#DqTmA+(H4}4Z!Msu4-A$RY3UI+oS}p^oRDCWBCPmBu3fnB
zxc1NJ(v|wnB+wMJ=QKCp{l5E{J2UzI`^#4%nx?fVt#lEiw^3S+QkhZjN~x?=lxluM
zQ45NyRMr`>9HXABWjZc5-6}VlTIA>_!tq0ZnqSPc1w{UwkR2*lBS*iEwejW5yNzn5
zxR#F`{rDq)jN;3R>N`ChF-GCa`br+ji#vRuPZ`{-Ph}16IBDq1dfnu1)7BV`o#tl)
zj-1upG_>?QVq&gUc5U6PGrE|}r2-<)4M}ugEUdK6=uYx19}MyHGV017)U-WU$7G^Z
zIg|QC*S*JWNAsXi{Ubdl+^IX57M6|%-y^y1DCV|q>Mqt9nH4Yd9$EcQ4){BgB6J`b
zZ1-e^@y$b5liMeS3#j2VEZf^r>B9cUbbpJbL&3NW%dEGemJqdVSUeC_VAQ=OXWf!v
zJ+TIN8d+;gw6A?=a>F^*cWHA+tGQ{>al(tQSVa_D&|OHy7*MSLm|5i?TVz5sC3F?*
zc&y>%QVLb$HES2+)+*MiYMw5g!jhuC1~X6Qa>CQLC&zukANKmcP}EILZSHPrc7@|i
zG3qN?HEvY7tqbfs!)`-I=Y4_w^{X-p9Za_~eid<^4^6kBxq1zQTCnx4I`Rk4u~#@9
z$eNXF6qSQIzm_=fU1h6j*R+BzdhPazNpY1h>eh|&{O9N;y=wD&1#ymA(pE)ABQ3Y5
zELip~cTX+@&ET`pfq$4HG(??vV&=HpA&LQa1#mZTPXM0>P6Ti-aDM;~01wh7<hv~M
z4FSh#n63cD=_*|Va~<zt*b(WuA(@+W>l8Cew<R+sEiOIX1r|2hreriqDanlac9_N`
zo}hcu-ls`vr|>xy8D{8#v=8Z#w2$eDv`>Bh89j$APA@1e?W}L-XkO~D8?bT8&;n6{
zVRy2aW)8kNOfV$4@riH5K2zuuK#1~qiV+iJ1w02m5iQbdAdyO;CGc+~D#~ZbAK)^n
Iz#%IA1u;)oB>(^b

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Enum.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Enum.class
deleted file mode 100644
index cc85236ba2a7cf396c8bc1bb030f59b0ad98fbc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1173
zcmZ`&%Tg0T6g@qJ3<=2l;R_W-O+X1Mx)5X`6{@I8L6xCcSZ<n0lQcD%iIW}*{0slX
zwF?)PYd^~J%!6bg#bUbqp1$|ob8p}I`|sCp0PA>Xqf&&xx{X&hUfXyhkn?0)2~5{c
z<(aIw(rZ@gCeU7UQ^59vhW4Z@Aoc|ETiVlRTVTF4=)6}x5*RUl5-TuUDi1o5LwyaU
z+ZCA0avU6=D#vV=Ka-**yR99+K}kcUGP4dluJ6&hN|;6n6szZs>KN^NT^kz$1;=l9
zWS|axfthTMsu#95Bf>&mH$7>>fTa1-VKoNxC$g>G3-;kscWAU*sp+m^9~K6{Eyis}
z9XgY4s18m9HqvDMxWW3fEs6CARJW?{Gma6OaBpAdOW=%e`b=d?5f}}WY<yB(-#t?{
z-rmq)mY++SJ5ke~+7H{uDmawKZae|LBi$nz=*UjNoM~yk)?_AaD%?6>zdAL&Cn?k~
zJkwG}J8baBKsTCX|8irU8S0cGgY3kw841dkul-70QKzfFMOQ4pSog!gQM)>-q!3A5
zi{@Eiyg$|vI)-^Hu%14e<m7zyp?=a!_*z1N<&1YUpZmV4hn<ce7}e-aq`+eA#^@vq
zUrfn%?;cD17l&XWhheT$$iwD;`W+)Ea4!-sVw5L=G2G%lg>g*8`y|i6ET%ET+gYA-
z+~@eQKCZWkSh&N}UEJ&0_sO$}2R-{CBOhI1SelF&9#hp5GJGJ1#l5hy`Um1CtRFG$
mGS@swK)Fx3&L>WIhUc{CjuOheUx}^Nc(qbVFYuDKg|+`kZXr_u

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Float.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Float.class
deleted file mode 100644
index 3819020cd91c0c751ce6732a12a4c31bcb6d19ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1487
zcmZuxOIOoS7@S+8wIDAARK)kIh>G~uB3ep|(b{rs?NK+JO9^c_CBY;`S>X?I?ZSnJ
zwLeOndlPAjESky8_ucO?N&5TG&tCxUVkwC?y$~oS@ivK)!0=MJVph#se%UM)%#vCC
zC?E;~{W;h11L*`c*=k$H&NuMXa4El-?MgQGbfBjsOUBNw%1OP=eps$$i|_Ns&d%PR
z63kL0a0DS>R6j1|S**A&x8!t7I*sXEOZt9B;8@^R0?&3D0;B1|WGo|;nUdU61C`eV
zuBHEv$Bz_Rt_*mhH~+P6Z3Z?MN}?<<(p`B!ZBu%_rJ3q}NNw73#P+!=cVLZAEN%Oy
zvt~PXU<n+ZRX1~Cu%=*Pl5l7#>OE;yVI&<Nd4J2)%64FB>viHhTlr1b3!jFTDs;<^
z9*-7GTHSJ;M(5OPo?25TbR@3Ox9YZ6TCw5_tkjf#Gv}_VEv(ON+42v}U0zwY>On?L
zJfKTfUDFBX?SP5O3pO8)^mp>herSLbs-&tL`D&!iNzRa}yBoCIs=CU7nAJKhqsk?t
z6ndU6=muRz{u_vyMmYFj(RQp-dt=4&s*(!|oG7|=*{Vs;Ry-1oplNgH_}dpY6-a!&
zs}6Nu%cu$Gt!z6%(+cc54Vw4t)dtI_Dt5z>LEGbfCUz>EA+F@~wrYskSYFt6PQ9TO
zx9!!ff~}_R)%qPZg}`8E7%d;iQ#=zG>d0X?+Srjg?F24#<S?_~dK)s>|0FQOZ?=a&
z14nTNM|h?8{7@4(MxKiCUh=*eKTh5s;{)V_F+M~-j1#Oi&N?SC!n+hkF~$z3cyAC-
zYvqiNjN|Nq$OO*m$a#%i1{cW{UW)K?*9n0MT+xy95uU_V&9C9Q#v4d$oWxCyQ@Ew^
zHtuMg=6|H>FcZb^;XY{!5AaaqqX-}4iO%EGAf}MPEHEVabe_}AIcm@8U_!-iPVGYc
rK;k<|0xx(~7K3Roc^wOrki|TiDwV?m<9W>r`kKHZF@aYwHNO4}z2`m(

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Integer.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Integer.class
deleted file mode 100644
index 081442cbd07cc597fb511b8e0345c665ab5d4b3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1573
zcmZ`(NmCO+6#hDiWC09YZ~?^?5>OU*37{l^#EM{5Fr{9s&ZJ3(8fI|Pq2Q!H$g>9z
zmS=yI__{M;h7b<vFYkNbo3~BR-+#Y;1DMBV6!`=g)}mOCVuK<6uCVo`yjuLQ&cF%`
z{dvc3NN&qAx0)jSouZUz^<zsE{&sS5!VuZ{^qv9+i+lW#&sp5A&E+lLXk<xSGHW)M
zO;<2XcKVkBM8TG#Cfw`_1;wOOlCEjj7)H~DLM9+<@ucaM&ZanO%Tnp?s($Hg8<JaX
z-DT<IOq;vMZ6bES-G-p#D%JTsg$xZLv3_KT18LGIqIkoQ>LOIS=%E_Y_AW!Zi{eay
z?QR*Sx=4c!`$`%`cSp~XX`6C|_CSjA1@#dhuN+IE7s(J#XL8h8qwct^-D;{tvp2nE
zYl6CpTaI1xqux@~uI2DR6umdSRi|080uNtf7)b}qJzZR^&Kvc-Q>7Q8M|^E^tI<*M
zc4bc(GMo8KnQB6M17KL}GO57E+Jg!vZF7{WDh!=7ZaDk2bFt%eY`m>in>@4Oc0I&L
zT6HIjrY*Lb`xW8taB7=jsOT8nDs$IVwns)}-K6G*yA;U~I+|Bu{*Cd{s4H`9%es)J
zL1pJ$vs$AB%K>F8b2h-_bx$hwMOP|Oa+<CoHcVA*pV#ZG%1-yzFT!*5;R&8H4ET;#
zPFku@`AHcje7dFFaNK<^PcIG@=(`c7UxdzUxP%`1AEmEJ2r;tb0Xso<FZ#&eul<)X
zM*buQ$ckeSLmG!Y9Pu#eVG5%Zd4)6)!mAXKqUW7uuG14cnelVX4SEK{O-y)r>x_co
zHtuN8UEI@nACnrVkk**Nw8j}c(3r$SjkBI^j=sODqXmq6IOgFajgN^BR>{;(fB}Wi
zXo}BCwM_F1DfRTsAF!VY{U9TR7j&utgJdu19BqlPh%8wu=@Nx9tZ3_%K11HPUt^W*
H5OV(k&NgW>

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Iterable.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Iterable.class
deleted file mode 100644
index 5fa7be44d17326d095099b7ab6f2454eb512a459..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264
zcmX^0Z`VEs1_lEL9(D#Ub_Q-n29C^<)S|?a{31pM84XRJti-ZJ{hY+Sbp7DW+=84`
zPpGUlBLin}W_n&?Noi3kBZDFyr8XfU)^<Sk8a5$TNapz`Wu+#USleL=F*0xk=a&{G
zr@Ce40L|tF+nJP;st0lmBZCmaO)wco1_6X1#9%f?21W)Zpx+o67+Dw@m>F1rd{!Wj
QiGdA>AuM(V4zLI(00OE-DF6Tf

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Long.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Long.class
deleted file mode 100644
index e3cfd99922049484d1208964618daa45efbd6b8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1586
zcmZ`(+foxj5IqwDVS`-4RlK1hnt*aqyarJchy){86-=ow)?~9JOD#LNnNaYgALO$S
zK3G2cQEJcZhHM~iRi@KtPEU8A-r3)Oe*6Tmh}SXX;$V0c!)6S52IEbB`%`JH@NR>F
zZ87v`g<F^0l_l;ptnRNAr5;6Gd+!swzx?$dhUo5xw-lHt?DHeO;BdFPkac*yo+f_L
zuDV<{Jd0ua?EXp!C<wQjUZsd$DT>mw-73R)ax0$-aeSOOeNt>%$4%N;a;qb&Uy2=5
za;M1~kRoHd+&gIk#v%9WmddPhollfckreTbW79g6HVF~~`C}c3iWfUlQtj+9%yeM1
z^`U!ZxYdCdZX}?Mw6_<aJr&Co6;icl#ddAEN>d<S=|A-mZj?`?rN_z8l}u%*vwBT<
z{)9DDB=PNF<Qh;fhC}MKqLdzcj^LrF9F3zQ8f7PR_&URAGTh4P<a%qoUd#H0Tb~=;
zsh_EMr@U{OGM)NJidHSDy6voJ+sp$|mOCgK8mnf7%L>8_QykE%VC@Qqk?;|I0Ljoc
z^k#{KNBvd?3$|-*Hx9~{x64ThhT(!Rxl`hvt^5Ft%9>664xKHDA#%K^Vp{hn$e}LK
zi7RWCv`rdy#<MF`I{jIQ>8DMHkgV=T<?VRE;ziN$Oe<%rIt|t0yvoZk&`Ph+3wVqt
zRBa3OQ_*Z&P%9V1R15Z*IpG~}d3t}aL?4hY`bBA-L^pcqe~dmW5%iKD5BYuM_hW$e
z2lf6CF2g_q!{iwl!Kk)lfgKNQBCr#<NRgAoiITlU5fc>Oj$FajbI7%G$dt}=9ql^|
zH*k}7l$~yip-YV!y>lCPv`r$V?JVZBy^DL=&SOE_1bvRxNlO9mJ|2*7V3~6I_F-Tj
zX&%i47-BS=r=;RD!k&|U5yhFE`vvwLk#FQgkfv1$45F>jI_{H*zDk}t`UPIn{+jkO
PdW{5fXR%Ix1RMVV32$tg

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Object.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Object.class
deleted file mode 100644
index ef0091628dfc16b2e9b3bf082d813a5052de3982..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmZWm%TB^T6g?w_%0uPpTM`o&?MB>VObpQkVswFF;ckEdhD<uO9Yp;!7k+>rWxTY+
zf;MT+?ddu9-ZS&{{qYIl0(BdQ44F&mNpr=Ja@-!n=2)1P;$g^8aooEpf8h<qy>TNV
zn<SX<aMIF45jon_Ks?X5B7MzSkw5gOVqlu?6GM8Sv`6ylTEC@$A$RjS5WbPx3vC?H
z0HeDmkly&OBW7uZjHitpy)k6t;#w&NYtE%1a5`?!#xad`I_)UYNP1k!cVXj%rgil!
z7>HY`Xrp|*#Q7p6Loo>(^9*MR)mntO*QPu3eH|Dv{9T)&p2*ss5kWBX*9DbC@Hh$d
zocEQ$DHz?u;wezIffT?>u#hICkg(|w9S5=m7IMhbSAjT-aEsn;>_m>@(pg$!8I=`f
a6(y8W`^Ti#7z?}PPWtary-%|?aPR}lsdgOz

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Short.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Short.class
deleted file mode 100644
index afb2d9db8dafe89106ea53eb801fd9357983f398..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1355
zcmZ`&OH&g;5dLNp$pbKefZ_`ufC(rM-x@$6LKRj3tAZ)@Vof$fvedGRyAujd`hz@s
z@L+lNM~OYNtGju4$aMPaucy1e>HYQl`wsw%SWjUk3x?GcUZn7nA+x=;^Rc>Ce!IcI
zDhz`q*YPEHWR=@3kvKd1LhQ`;+Pi?106w2FB=_FGp@iY`0YByoHg_5eC7b(xk+>DB
z;c(gV1jAHkd^rYGnyx2{tCW(KZbf>Q(_k3OR|;{ChKZ6r;+`*biXwGW3e<ac<HQt4
z(xM4cSYsIP!P`>A)Ug_Fcb{RVCnbKp?vi1;2eGZwkT=>fKnVBMh3VEwlD=ijvE(XA
zNW|)YW+6ONJC#De0Yf5RSf}ZHbyoz@9BC_jC(YTSEZcP&5#=>y?b|MoWo<I_*WFgl
zj$QtWVKm=1%wO5lP3|{KLF3|6i`#xj$Gf!yVaj6R1JyR&LwY5#=c?<vBrH&SZ4dW1
zmGERxB3HH?vC}%N32%>6hYTZS*W`AUdzSJ;Fe#fB^$}mbV3!z-lSP#jZDm+Qt>vjB
zn?hP9y}`O?)f;quF~$t)#*vbqM-}e9w%Ll?@=UR5sZO)Hg?Uw(As02E;Q`EJfng|u
zgK8vH1V!Z-CL=gtZo1wfm;d$~OY~JH=$E8(0_V_2|5NmZ8%UF%iTPRb`!PWAK^;Gj
zQHtj<L|z8N7@^1o`ky4LBEuN#K*n*g3%S&VOz8VAqdmfK1y?De?6tNWhU=KrksG+F
z?JeBab_&zl&ft!=c@(tGVOHC@karjNv`^XsLyR<DBsG=@TOl0`vYFYrpJ3l$d?m-g
neL9s;Ald^u#{&``;t_dDj>mXH@u%8*rcWc3?Kz6%8(97WJJm1$

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/SimpleIterator.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/SimpleIterator.class
deleted file mode 100644
index ca7ad3d7d7f39207bea02dde7da52af6adfdf56c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmX^0Z`VEs1_lELK6VBkb_QNX2KJ1^V!zai5=I7Q4b3P<29`W9M?^!@Co8cmQ9ma!
zFJ0e1DJwO(#F~+TGdMFnFR`SwD3y_cRYNl*1SqCq6Jmv_)(%sMk%22XzqBYh)h#mz
zs9!iZGq)fo)w3kED6u5JNDpKkBZCCOR#bUL1_6W=#6fI~42%p+K>si>FtGqVz`(-5
Z0Hj$N*nr~fAW;SmAcn9w8MweA+yG4IK6?NF

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/String.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/String.class
deleted file mode 100644
index 08bd0d3bc20b2fd89f661bda9ccb24e2b8db38b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2732
zcmaJ@-&Y$&6uz5=Y)HT&g%oVns<quvTToG2L(wFJx;20jpb9Dun;{uocGKNS1^*_W
zeel84Xa6XVcV_RlfefCUv)|kw^WA%A?#$$$fB*U$02bi64aWtr;8z=b8%}HpYzQqV
z)vK+>fxFRaY_!~Mcein{xwYEZLPPVIy<qcwDg60*c+z7LlVMb`V6-JV0h9fRTQFyI
zT28b+3p(>H8Hu1%S;2|9Wf2IuV!;)sylcU<Gwi1HBhG$Zp^fOeYLs{OYi=^ksiD%%
zYMq&(&^YyYPl_;zZRlBW9evH77z3FpYE9vd;jC)?qaz+wl+|`zH_0yN^PnTUx)>L0
z^SUgmN(-`%Tdrfu9WLvridFV%PErVJYiE+D+N6}yaL7t|zoxh}<oNSG^Ks6(727;K
z=ANvS_beFq!a(vsHpuUPYC!LagwE{*VZ`e!#%(-DOgpBCM?Jmqd>b3Z=!2DCd*w68
zI3Dp1uKzldURRYn<G8~+fGdwdW}UrDZG~8}NXE~ET4~cdX@)!x+T@e(vbb9h+gOw>
zf;K<hJWBQiGabQ=C?ghq7E3oZnpx3pH0~e9x_edeZh1I=l@d~#3`LyW!iDC6hpF7W
z;HEkwwW@=G`{yxio;#*aFwxr)@A*tomz;Xtn1Owgu6<s$2NMBq!x+t56H$!u9vb2e
zhcnU_h^gxPxUzB27s%%r_}udTFr@`|4X$R-q70kiZ#+s`HC-ZoFEvAt`MhFGaLO^N
zk!`2fOWCrxzbAM^Wten5Hirz=?o^|Qoh2s_PqY1k`F*ZhDGjghw)6;^>MN;R%w(8J
zt~HaX=!Lzr-89s+vu7ljcFe@n&eKc$*Dleo8udAWmq`>{IPqz%crdcb`MTN^0pIAK
z9P((J9s1adlX^dPStOK9%B<`P?7T@+!I{&A^A?Jt9+|U1cDWQD9*<fi+8yLS9^fF)
zL?goa7RRW*_+3S=4EWL0g<9jQH0XK$P!?KYKl1pRP?Z&v_IRM4M7%-u%Q*17jlmq;
zJEu?5vtUZQUdS(1Ylhbe;$ePGJa|P|a66^h3F3aQ7e<n|8-W+L@ojze*uls6ykEgz
z7Dgb4<5{pFk2s2d05VX3RU8*#3?+r*gl`aDC7d99lW-Efui-e0IHhM!4{1u|d!29w
z5irKAmfwOK8gIhe8sC9;HQs{v2;aZJcndzzmfP^5#yfCVqXT7)xZD~)BD@a|w0s}t
zH7?*<s45r8{}aMbDU(I`OxqXXbB#+RFOj@Ryo>OV>`A;Ok{`hrTK@<t8kga*#ufNd
z<5y7CSfjXg!c}N!{TksD_*%<Pz}5H^z9DRCTqk)Q5_yAglki*k4*f=93tEKRggY8{
zA;nbxjO^bNsyfvC9|-pd_i_0w_)*1~!2fyh6ZX~5XnTyElu<r&_g;eaCuIIWAp-~a
lRV@eDa=+lWlsEx{LzGkq587zwS~}9-3^is4x+rHr{0H{Dkp2Jw

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ThreadLocal.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ThreadLocal.class
deleted file mode 100644
index 9ec8fc4250355a511585ac794dc45b5721c8f199..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 338
zcmZWk%?`mp7@SpY{VU-C+_o2WMjV|a4mR$qHnp;;q*@Q>-~l|8_?86G%VcK0`SzQ=
zKdv_b6ZCxqK6(t^T&Fr;FgQHiGPJDH(rl$E6vKdrtE0Tg$jCH_*1MyM^BF^ZqmxwT
zMMe>qheD9&Bq}F7TO9K8mVMph6t#rU#k3q*lr4tF=2T>{T53bb0&&Qc+^<ftG-F$g
xZhiax3@Q5c-@P#cLxp}1REar+mbvgq`NS)z5v%{{2AZFFi!$$I8=coi_X&OtN$>yw

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Void.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/Void.class
deleted file mode 100644
index 389a83e75c12541805bf4ab2a9a01532824e4c9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmX^0Z`VEs1_lELUUmj<b_O0s29}V>09Qr^L7%L|vPAuy#JqHU=bXgiVrxbQ&fv`S
zyu^~yqEto(WpsHPB!RH}%oJ-opbj>h%)HDJJ4Oa(4b3n{2Cm@z(xT*4x6B-%37jBR
zdLUaE8Tb&EfkYV@1P}uLNm;4MB@BiPj0{Xbr!q1~GB7i+0BKerkBNZ|EY8lr0hZ$g
Hi*W$}ddV?w

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/PhantomReference.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/PhantomReference.class
deleted file mode 100644
index 33abd12896e1ae34bd33c1952e5fc324ab63536a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 385
zcmX^0Z`VEs1_lELes%_4b_PC12IlnC5=I6Q4Nae{#Ii*FoW#6zegCAa)Z`LtMh4E{
z%=Em(lG377Mg~?5&5#hF7@JLIUS^3MBZIL9rWPcTqSQ3~pwzU~qSU<P)WFiz(o}2B
zFh&MV4WKD_mDvCl*n!oW*o0UiDTO-A4oL{b5{O1d2Cm@z(xT*4x6B-%vqb|k67x#(
zbKy?W1NoDYK@Q<vkRj-*7#YM-6~Of~C^9fIFaZOR0Z0PFkAVe9vVwVRKo&a#2b|9d
OQ~{CUV&Dd=-~j+=dS?>=

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/Reference.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/Reference.class
deleted file mode 100644
index 97ff09797f5f39a4d3a508b0cad28476d6726339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmaJ-yH3ME5S&e78$t*H5~%6U4Mw61mOD}*A&5mmXUxXB$U20v`M4B(03U@|pOF(3
zM05L^nZ2FQuhj>D3!HcudzcWq8JC2y@^6;OdlKY{$%5ObC8y;TVRx=Glay7#1V{OC
zEIlX9IVpsw{0Bl`zg?TxiYtD$tw(~#O@rWu+UPPOOw_h|&32VY*2(1`fDKB)i{PFY
zT(C*`uHI%@eog-u778G;SQW<84d~B_(RNF2n!i*<$}^qI*~514d2JBkbnVlxZxKf8
zNh9Ao1EC{+1FmFU^yGD<>e$-Dj^yGp`Zn&_2n?{_;)XIA;GnHX!fg}|ab%T_zX6LM
BZlnMJ

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/ReferenceQueue.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/ReferenceQueue.class
deleted file mode 100644
index 03e42b9f312e45cea98f8c37ea9cb69032c840d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 516
zcmaJ;O-sW-6r62q(#Ef9)r%t5Q+lzUO$c~UPz2Ei?=ilHl<g+0o8oWt;1BRei7%=B
z0BJA#W@qNjzQ=z5e0~AA#F34C8yx}5PgQCHfx6p!5oqL@lmf?Y?_m^8qP~n&($_TX
zKhuyjshB*0)*ww(WC~3JXRDol7<vKQEluNW!rl}2eqF3{^AS^S(oDVEIIwXj&|T9p
zi+BC-YH8TV*Ad0W3;t6A&LAsvOt-1zX*%<jo(d}HqTH8fT(NfL5oj;u=|ckN3+hfv
zN+Nl!lVVKD%=ZyET{0;{S{J#Yx48jb2-NszfCi&FpWwOyi%*+z4NXQZIE*&=ZgJhh
Z_Mf&>X(d-`Wx`BpGB@qtMZ3z``vt&qfwBMq

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/SoftReference.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/SoftReference.class
deleted file mode 100644
index 087ec244449d0f51832e37fdd0dab6d9d41cf86a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 428
zcmaKo!A^rv5Jm5lwzO5-+SIt{${lRPL{}|g*_Da05cfz10wFXZ4?oU@AK*tBhu4Ne
zG~K++ojG?h?|%P$egSyEwTYRDIbrCgMXEf)jrE*`AEA?nMdG}?XB?@G{YDu3X;Or$
zDp_DF2z2xDAGl>NId*m&bIC=-uN7CUU3P6hi@5@Lnl%zugr#M-_~TWCfn^IwcyfdF
z-?`UnbuKw<Crtc(RYtr`bNSQ4-^Z#s_P)-5usTIiZ|ER|+wQb6;|_$L<O>*58R*M9
a5Y@v_YqQZKsm7Qz`a+lkd5J6SnEnFuCvB4e

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/WeakReference.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/ref/WeakReference.class
deleted file mode 100644
index dab0fe9804a0d7e3374df86c4621727f1d0ee945..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmX^0Z`VEs1_lELK6VBkb_QNX1~!|_yv!0iMg~z0pRB~PME#t^ymWp4q^#8B5^K#c
zMh4E{%=Em(lG377pkj@X5U`*z7R5-~i&E3{gHqE{i&FEFQv*v=OH;wRG(p<&DzgD9
zumh_#u?ew4QVMmD9g+}=B@m5_3|ztarA5i9Zkahi=L&_VCT7Fkp$GCFBZD-;mmm{R
xlrS=gqsqcHGbl1JGB5#yjsZwAGB7i+07+Ibj}6Rchx0jrDj+hP3|wFp+yGN=W6b~n

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/AccessibleObject.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/AccessibleObject.class
deleted file mode 100644
index 47de3236c80eb46bfdda76ed66c1feabf3315829..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmaiwy9&ZU5Jm5pXf(bHD=V#%#@H)@g;s(^z(T9Itg;fKWLME&v+x7_C~*_P1sj`r
zT+Yl~=J~om01VM~&~VTs)FoF_#<-MX8*_s1Z5D^<5(ROT?1Pl=V$M`xh~@U6h0)qy
z5!~68@skqAL^@~@Y%iB<LK>c6dH$ME8jD1zN#16o;qja@J{Q@|j=?|c2blvx|GyDJ
z%RrxDLf1$kXXjL?+t(?2AQbcu02>upIueR`r%meGg7c%4HJ8yYsyY*DIu=lW1DLK*
AZ2$lO

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Array.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Array.class
deleted file mode 100644
index d24ca714342a835d5ef0cd3183ebfaaa942dc786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
zcmZ{lTXWJt7>3`ql>n_;4=tXnwYGp-tY-_u3<sG>hmnggUev3UZbLe8<AkKP{xmQA
z0sbh*ZxbNYU9QN!-}4>z&2ISf_t$R#FHtk_-oOWjOwAQ;SZ7!$mcB473I4+rqtF%u
z&ahSNp4g{$#j}M|X?gZ&R5eR8Qt$AD55g)#{?plje-B+>j0}8a$XTu<>@W(bNTb%@
zQ*-J{=~};Et<R~yt<cr4x=9S|F_aa!R<7%Ln$+Q8mkTExGOW%fj`vnF$r@r9F3d2F
z>SvIKP)gJHJ#GtzHBDW!biiOp>O3Tq^hh&7T0=XShqM^7RK*(l0nMl{W6^6S#uRf2
z+N7MN>kDUIk^Q7m$MfyEWjcwUZ9h8n=5DG@hK{76MV&3`Ns-4gPYF{y3%a}mi5U`$
z{nRqe36mJAWm=NSQk}7*TF8=6hM?F|En-f3C7x=T{YkH}samKbp&a#^xT>YvlFD0t
z6byLBmFDLgL13Tn$otDsNUw3gk3G7yl{n0>l17p<&9IqDpSfd)?kSI9%l*lx_ncuP
z#Z1p5&}#%v^o@&f1}dgdT*DMc{Hzy+z2l}IiKEdJ#V!~w(YFa$qu&KA(o+tXk)f4A
z&x;h#k^)-i<H*uDB8lZ`><Y`_Dy|Vd$yz351=q()Lf;_mCT=O(Ds@jXQ?7v9igpKg
z7407GE7}7*RJ3(GQnbg|P_!r5RJ5nqQnYOp6|ID_qCLZNMSFoAMXS*N!~Y)a;+3Mk
O#+!>8t=`7(=iNV)BzG_X

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Constructor.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Constructor.class
deleted file mode 100644
index 0e661eb28721194ff6d1ac99dccb6733bc97087d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1037
zcmb7D(N5Gr6g{)(b}6VJpr9fMC~ZhwePuUm%&JKfQIl<akf+%)lp(WIoK8`H%?Cfg
zk22nEySv5upbyQ=+;i?d=iZtA{Pq0@fM@U=JaVw(V3(oUm0H>!!=d-~oL};`;yP~k
z6;IR7@jpa@!2ifFKajEJHZy|ZMXgXb3_HF5sJ0vn`$|NL8>!>m3d4%$*W56y*Q13P
zgF{8$@evtXy+Rt;an%mPA`y;~6L~6yNg3umKVTS3f8d7ltT5rX3qc6w*C$a>Uw@6n
zg_VgesZH@Y<BD?DszZ1`JQtDe_@5YBXFNUYCnsd9Ws|}S!-5uH0-ai}BLeols@x>G
z(tR0XaHsmIgFOe29XxTc&#>VgAJh|kx(9}^8y?oNUL|D2sUpMemr*3rR1TFW75~CH
z5~HCoRMs6NnTf<3si=jeenRb-EV7AtI(}9Ro3qz7sb3*6?9}l;_36Irq{0Bh_6#aU
zX(b=u%ydLoDN2c$t3shdskjJAiixw4(6&N4m`P1q3G`(W<$57E^oFKvJO@LAzB&5!
zT>7rzI-Q!dYrvsh3-i;nOS=Uu62@=?H}mxtmhyGETyJ9~Kd+YfTFJkIyHs(VFqbqo
Va1ZzKpw!tUq)>c_En+mV{TnxjBgOy#

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Field.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Field.class
deleted file mode 100644
index 34e96ce812429838e8f59691c599de72ee3a64e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1539
zcmZ{kTT|0O7>3^kZQ6<l<meFuh1LTV&sb!Jwsxir;6)uTxZ9>n8fKedk~;F&yzmG3
zqa43Y(h|Gdi!_sWpYPpo-+sxTzrTJ1c!@m=I~G1#s50bsUC)j77<NjBXZ#1RNbWh6
zy5wP4%?Rx%a6KohBuJ}O{>Cuth^QfK$rThYFwB+8nfiogu!ub7eZesQ-+JoLFhjtR
z-*r!25rhoWrE)8&`g(CrRXOo}z$Gm#WZV7HITLnNEuS#tdpzvb{VuWj$WLs^hFlpo
zOf{J%QyYfj=byGXk6hmiE$mwOL=rjFd|wLgCH>ScBHF{)MlB)gJswOT>eL+>wtId+
zeHl&KbXY=K-XtK+<<R$>2^I&*E=}q4NhVE(0`1c92OT--I1S1#RQYWh^3&r}15qS?
zl-8o5>_kzPqT(1$NNtEDIhv5VLh|I225Dm2ipdcZCut($5mvn<QJRp0;YMkeCZ?&F
z0@)11G(imo72EzGutn2Vkr$h;kliiy?lCM~zJh@`l{D0qc$r~MU)i^95r!`PamnB^
zEbGvb=ywE-VWz$%rEs|151c_?c+qIq8CEarhfuu72*EZOrs$fc56NA+uHY*DQoyj{
zdme@OUc|NdK9lO#aU*`dnd-MvZWgzxdXCm|<U5ZAdRioQTwB7jrrn_q#<_dAuW1kP
zP}5ehs%ej~rfKVVtZ7fMp=p~aX<8XiHSHOmYuXEJX<CIo)8l8`#w$&GjW?S17Vk9e
KJtaJa5B~rJXIkh0

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/InvocationHandler.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/InvocationHandler.class
deleted file mode 100644
index 4627691def0f64bcd583f788469d7629addfa6a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 284
zcmZWk%MQU%5Is}$dMzXpKVZW~?Ykx<#DbmGZF^B}dZns-n}rYXQDPdTO}d!OoJVrb
zyxxx|fHB$v4S^=X4x`kZ6k$DB9AzpUEu+1&@{Y<++yWD;oo32es^nk-cUzEt=3$v4
zG$(goos-Z+7l9VzwYkQ=nueMqdvnhAWv0$#6lfKXvI>NL-sGQKvJyJE>sx`)&8f{H
dHaF>MWfKS%e+^KTP(hV(jZwC39>KST`UmUVP@Mn(

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/InvocationTargetException.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/InvocationTargetException.class
deleted file mode 100644
index a0cd1bd34c97c4fb4de921f5c2d2551ae428be60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 337
zcmX^0Z`VEs1_lELK6VBkb_QNX1~!|_yv!0iMh0dL%`ip=2@RjD#Ii*FoW#6z{g8~J
z{PM)4oK$O&looa=B=x~1MVWc&V8ue|sU;zaML^QEB0067Br`vckwIKT6G=6~bVdda
zphD-w(&AJ`2Cm@z(xT*4x6B+MN6s^^EI&CBq#eyPJ&-dQ8MG0uElN$xNlh-%$Ek&p
yK^UPL?komH21W)ZV4yHCurjbPFat3IP=p!CgV1bXnw^0IOmjkME+CJIfg1oH>sm?x

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Member.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Member.class
deleted file mode 100644
index b249a392fa0d37d033a65ed3f80fe75584e87ba8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 313
zcmY+9%}&Bl5QWcBZ21)s7y1UUvF=@IiwQ|lBf<Tp4o%6WO>Qqf919=7hcZmB3vf00
z=A1J>Kfi}>0QVRN7zMZ@_;0JHWF8S{PUuHvQCU^k52g3)i4%lYJd2XY_gP#s5k?u?
zm{YAxUSyG0RYe$2rpZ=)sZgsT3tjVp5Qy_d?U-==PhZ+PDu$jI7UgHY$=S#hZ!(o5
zI?HlzQhv_01iK5~t=Zhw!wEO19fmiWQyc#2gyBhgU2jG4<s~%a<OXixp(%9X$QKUI
XxCO6CXrlv2?V{&uAD8a?fy)e!yZAy_

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Method.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Method.class
deleted file mode 100644
index 23f464d74876151aefa155ed9ee4de790639d678..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 807
zcmZ`%O>fgc6r4>UP8$kMo6zu48gfchsevO3s#LWgS)za_;!xDX#(8lz-Pq}RQ_;WH
zLw^823h`n)i7UgwUhlk_dE>YH`_JtifH!D4c<Er*!7G8%dle{qC~(pKG?v%0t7YJK
zkF|`VUIsX`Mg@NFX9mh~5+F};-Odkzs!#TWJT2!&F;!r@-N_jWIL!PkCnQk2S5Gqt
zJYvFWI8Z}HCK4#NJFdV6gWt%`Oz{0?%G!CquhOuOB{PSZ$$t5G3H8G-kET|Iv6`tR
zx|&JNANA~9zVyfB*<R;dpgfY%=r|m3tFjG~Y%Ej3b$H3xyMM^Cy%$cI|4$)-^<|jI
z!JdPrgV&6ng)`&PN2S@ma!Pg-4i4r=CeT=&oS~uSh~1<v(8`yNJddJC^))3O|D&Ju
z$p|!8dRJ@mrB39_i1%77D8`>nD6kpQ{>o<&(dAKjGM>3Kd|FF3-a??jPm!-{g`Wp_
z$Zwu5oOmr`Ene5-Dqn~c-@xM-f0C}7sK)!Pl((JgYN)f@Q?8Y{#||2J#{1{IFW|*r
DB@*9V

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Modifier.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Modifier.class
deleted file mode 100644
index 44e0fa086959e5bb53376822009d77e588e038a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 834
zcmYk2+iuf95Qb-+w07DighPRrQ_C^o&=hV#2-i4bCF4Z4u|)4Su2Z(M){?!61Xny4
z7d!wDg_yM$b#M0HZ|0wW4}bpt`V9cb@WzH?8(tIGoPRk9s7HWM0)4L(wPZr3tXSn8
zbP@vgJff+a_zEooy?HcCd@u1oszMhN;>1m;r^q3&F{Pm!C>RphiNA*4r)U<^)7E}K
zz)5ET`hzC#1Lh@>8^+WR6E*Y`^FnN=s*RU|9t{&en!27USXgk}lNd)lW$z;6@eysv
zQS^=rF5eUAjK(RNc|Bh(3Z4<@j_CLl^RQC!HIq4kZM83Dp2_^I@y3!#<+XV|<$@Ii
z2E2~Hi|kuf3jRa6ws@VE1=@->AgP$Bc`jrV5MpE9HmHz!wPYC*&bW(ORxE2>v8;Hr
zm8IH>a{{|~yWoPY*`#3NeA1TR;%Hp1sw|&2$Mrv#XMD-?>PR^W>|YL4`Le)wO#V9v
z3@@9r#Rc}@5dX)*Ki+{o=rn(~fn>oZvTd+~+%tF!dD~z$-#2)Ge8u1)@>PScAzwH6
z2J)`KH<51{d>eVs;C-Y!2H%ANzT_U<$J_Vd0UR`XsP&=NM_M0ieWLZL)@NErTE|+S
SYki^hCA`9X0!O%7F!=}nGKH=H

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Proxy.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/Proxy.class
deleted file mode 100644
index 171a6696401aba6408502ce4f51c7c50550ae113..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 698
zcma)4!Ab)$5Pj3uu2!p6tJR}|&|X}xvPBS4EEE(99`uxM<C+q)vb(L-PxIgh_)+3)
z6uY_<N(f2byv&<<$;ap0JAfnXI@ofs?Vv%R2f{&jD8|Co!US$4@3r(3w`0bkFA^1+
zOJN3DMjoNuRz@W!gkrOGLufYVx|dR`flRKWaPo4dMH~~_*{c@ohGM`XcbSwH_gXoG
zP&uFY@+mDYcCbUJ8To9}cTAiJ<4Zz+eua#{?C!H=T=j=+5gW3i;%ry-oTk^hCDgh3
zoSlT@Ec+*AR%LcAY(Os@MZUaHnp>^d8V=JpBsB6*X~S&NH1e&+m03uIZcj!^X!R=k
zX~O*}v!k^Pgg%Xe(W5lUukY9cp}@1qv&3V8e^!~1G92EOcwOXmiARMQ%NAq9_*}*6
TKV%Ix%U#FDp9o=-@dD~!Z8ybC

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/ReflectPermission.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/ReflectPermission.class
deleted file mode 100644
index 478d0fe19eab306c08abff223dd0a1db7b15db5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 237
zcmX^0Z`VEs1_lELE_MbEb_PyH1~!|_yv!0iMg~z0pRB~PME#t^ymbBGlA_GKbZgBp
zMh0~(;@DMk1?QI*C8xS&=A<$*hy|sl<)kK;1f&+_W)>G`=I7~wjAvv}M%YpWQKFBb
zl#xLetg1LQxwI&=q*C80u{bjsVHATQ10w?y&?5{$l97R#fd$9{(X3#a4J^(M0C-D5
A%m4rY

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/UndeclaredThrowableException.class b/java/java-tests/testData/psi/repositoryUse/cls/java/lang/reflect/UndeclaredThrowableException.class
deleted file mode 100644
index 6b394d3046956503e01e38105ae00bac7af22b75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmX^0Z`VEs1_lELUUmj<b_O0s1~!|_yv!0iMg|EDpRB~PME#t^ymbALjH3MV#H5^5
zYt1l51}*GTNa}-2iZb)k!HUJwQ%gegQc{z15{pt(;07@=h-+vf>3~aEGcs@hwKyl1
z7N;^Ya0Ta=7A2>;W##}midf8Xtw>HSD9Oyv(*wDdkpWCW99@)}mXn%XqK{7(BZCye
wmqDd@C7HRYa3dKM85kLufZ@Zyzyf4314#xj%?hU37}&uy2bAUn@|YO701f+KLI3~&

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/text/MessageFormat$Field.class b/java/java-tests/testData/psi/repositoryUse/cls/java/text/MessageFormat$Field.class
deleted file mode 100644
index fa8c4f209a4c9e250cdc9a02aa47c5b8bdb81759..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425
zcmaJ-!A`<J5PgF{QBbi0#)BFY4{)*GF($@PLn4}hdSBa3v!rfGcWwAK4}O3jWgObX
z!o|zZo4hw~-t70!=NEu0^c?Ita0!ju>HW)O^!Q9Tdzgz%cvdd0H<8AONcu_oF6@P`
zWE>6&^=qY-y&-h_g*FyC@@6(wIvNgM3C&cBa4Jm_XOhtA57uN)Z*v(~cG(#%1G%s&
z(Z<0c_p{_94WzGPo^dxeU#=24=nzi+%|@u@840bi)-t_|g)x%tyM$gjxqc4eG$&Nz
zjddns6&3;i!V!+j$&FNmcF7c;I0vD^UrRW~7OIRY{MJxsRE2{EGut`lgPCjQiWb^j
PUG53H*k?rr2dnxEP=0Kc

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/text/MessageFormat.class b/java/java-tests/testData/psi/repositoryUse/cls/java/text/MessageFormat.class
deleted file mode 100644
index c331e6dc74cb3afcf2423289039e49680163f33e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1457
zcmcIk%Wl&^6g|^6ag!EkOOqx*p+KQFkEXy11p#eDrAS3YD(V6R($twau3S5e$0+?Z
z7JL97g}5HOv7?v;3l{d7JNGf?K4yOX{_zvQ9$pw|8Q3%MjG=Vs3a`(w-1U7SJ01^1
z5i*otxxTAjGt|tZGya{oJnlQKV<lbRX<H`@I|ciRWu#oMbrjg#6WX#83YCaiv>6*G
zvspK-*+4{)k4D}_k1Hjl&rngpWIgf7lVoVp!H0o7=PEq7*q2UpE_~JX`(n&cH$Nwb
zC^1&8#7eWRW=;%^iBJ%rTO1%xH;G3KD6PLSsF_v)1%_(oLv0vn{tRC)`RWuuoSq3=
zwG#rlqz|IOK*)4I$t><}F9==b27Ws&?5qdF%YuHU{PIW6Mrbn_CtPyr(Aa#*NBIvd
zn@K%B2Av@tY11fl>EkMp4DEumQ@Xko`--ObG*Y5J<4ie}MqGx1;cY%jI`6qg_hPH8
zo&^;uz8aUk&exK9{cdcFQQVr)z;lKrO(Llq!<&Dik{gD!@RXG81wJJ;eL*JbviKHp
zkJ>hM$y2rUiD7Zb!(k`rQ;2!f>Js7OAd<E?bUoTydoRL}J0h9z-T0Yc*wC+qF8Gw1
zVI|Wf9t@k=)|Byf`Y1Iry)OKuT(}E{IeN^1I<3kuXcgn4#tNz$m$0nyN~*t#Yg%5x
zs>ZbxuVY=ywG`{v&~iiLDw?=Ka)t0FopOuTAkQW?2^ntVj>auw70X+=NB{e@ULf42
i?*Sfa%??bB79MGQj3<P1c&h)qC=pi4exAMsRQ>=oC!C7_

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractCollection.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractCollection.class
deleted file mode 100644
index 65329f14876227df401a29c958e49c73b0de8795..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1103
zcmZ`&T~8B16ur~0ZA%qI3L+ImP<M+^^wHKPwW$e7gAXM<$kTMYDMPlqWI83mU*(ez
zKKKLtQN}Z~{aD@lu(S7^Irn4k-1+tU$4??UrFTV2(TPPhi%u<i%P7|nfly6GY1_GE
zlo!gAT!oU+rtNfZ_#LlJl<;e3Q@+lq&=bRetBLd&?JN~FE;{ull$o*k3K2q|F|x$C
zGrCpx27f^+Hw+XP!I)9mjxzZ?7}h@bZ#-Ak9Y`z{wxr~6DcjCfQUe9}56H&IwwDN&
zJC*FKWB52`MLB#hKqG8TA!$x}qwo%8ugnT;`97oVX^o~E?a=p8qzD7!Qdz#&s5YaB
zNMK^@{YQ6X`lXW>qU1&mTldG<S=aYCE+wzRo{}OMGTNB6-gGTu(TB?4v>4s`UhMKR
z?Qnpzt#(D=oli!6PhRl84`#g^y4=6yQfNFSGwNF4es*Jn(CUws<gSXfK##<Ipsqb7
zT=egw6oVlmwi})I$vbN%saW(y)Y%Lbd*MX7-Y21p+)8FY(KA{ii}E=8VqTL%Mr&p}
zHe_hx!efy-vyVrTCd@D1%o^4#<%lwvHp+u7fK5>mc!f%^89ktf=D!NH#*b)yu6u0o
z#vGSnZ9+GTvjywP)Nh-f&iNf!l^A{oyc@%MfA1gsT-OPHpI)GFUGD+TaR{ykmf@eR
nekb+~Mv7iy%^5OHuV9xV0lg+0$iYWcHEU{m<Rf|moTB4Df2jP>

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractList.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractList.class
deleted file mode 100644
index efe5b38554773e5886ff3818d3ac3b07a45ca713..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1348
zcmZ`(Nl)8A6n>M<1X7k1C|e73!-1A`Um!xF5tS@OAT@|XZ<A!244T-jGe+&bKd7f3
zdgu@6kE;63BsM7t2itG`-uvFX@t?oHeiP9Xs!URf-Z=Eup*@H88BKJ9RyBxx&4_u7
zauw-IeZVN~md^0ztrnvNw|34icv*43T|Q}?i>BT$ePooc%eK#T6bdA|r$^S9ZVO;7
zxL#>A$%J_&1OmBd!nRy*G-_;O-t|lYo4YtR3++1nAV|4Tbb|}@<w(CJzMg!#h6N~3
zDc;jw9F=V<!9xIm`JqybR^nojma1G0lmdMj_?GO(HO|To8a=Qf6H<$i>j0RG?tq$w
z@&<McV|A>fVlfyMlthCG%F2JiwILsn)~|KOXsgM|*e<T*gV1n~!`>Lc=|v4=XEg76
zBhlz#d5k$u&WSG(S3T@qhxa<wpoJsCs+nWxpV$ZN7;IUCfpc7o`Pkj7%kF0-;!&Vf
zrjIaFlfF2Px(yMY@`gfwu@*GBI^&@<`oNgc9f{IQ{gt!y4;wul@}@R~fS0d-^L0mP
z*~A9C3uVjna$Gsu8{N`_F({YY(dRo9VhY4Vn5+j;*c9)j>2z+mg<W&c3Ur(9U|Z~+
z8|e}=8FgG1W;A{2Hbpa=xbbPitnhrNEamVcC_-~+0ungWB;HeyQ&h+>x<S*4J_Bi%
z<`TUKDNi>OeIC-nmH0)vWpS4V-{nD_6<SU5)*yjoqOU{Rpv^?TYxR4Hejm~UdYI^2
zkX-a_`Y+Koz8Tt~M?|v*_c8eH!d8Zt;hWw5N$dxN6ikEx7-JfLL!v@IfS%GbXwUHw
Ry|C}pU?eZ;74#In{s(=GJTd?P

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractMap.class
deleted file mode 100644
index ac508abfbeca22d2327e7dd569e2a2ee3e5306ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1106
zcmZ`&+iuf95S?w^IBh93r8l7E8j4MzY2OgBB2`h4P@p`x$^&m(ca^%hwz1a{<<ofJ
z1NbP!*|p>5hN5Waa`w!b+3}yhzkU<Z5gnWK)}%v|nv5!rANsP*XwkC!jEvO(DYWyE
zk?E)1>sa1s|0|<4FA631!?e$X45%&Z(-j}`X28Qi^UL{_@MOydZgqs~33YcMB%_0Q
z*xBohmR)}ka+xJ4P_@o_E&HtB0!y5M<=q^XSrU6T1W}3$R5@KG5!cZWC3fa877$cC
z2?9nN1tgPx(EQBfmKxOFRM2UFz5)KWPA_?Z;0eb2P29Mu|C&{((kuv}r|s#O1CBNl
zm7yAN%4l~2(TRcpGxnnpnEn5x9IXMf6QNA<+Q$=6)OH&Aghn0Jy9%qS>&se#_@40q
z5~`Oxz3fC6>N#ZO%ES)`j5bG<`t9>5M4{~{1adN6tOlc%?hjAIs)5v`BSx;%dq4YD
z{W-DrENrrcQaq}-QI>e(gC9W2`pJ1J6Yfbo+@ac5tgT*J-TPP)(CKBy#@|A5pHcl5
z(ovnBM$*mVI7+0rD0?%W5u*kC7xA^#$iQz27M_(%eO75%pDVPg&pXArMt6a_hu8wG
z!>Z9n>EDO7IhNmozfC)3eizn*qRvBlRL1vU?bGAZe_}9tI+j;jpBMFC6#DA)5*iFT
VpjXIR+Gb=!Rj%zdHMGVz{{a4H4HEzW

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractSequentialList.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractSequentialList.class
deleted file mode 100644
index aae94b1423023054838a5e44deaf2cc2defbe10b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 718
zcmZ`%TT22#6h5Qon%O<OXoWqs5@gU@E`o%?g3yD}LvN!FGBWMbI_r<?p&!tXioO}$
zMbjR3IG68o_RM_$e0~wp9bGzf?$8CJye9*xTa2=9{T1g(Xhvn%uXo3M${UIYqsDW8
zEC#yCXtO6r0oQRPKm_KcgJO1KDA%sP%2+Sr`rysEd^luuyq1e;oEa2RJ`(TY)YyX2
zR*F$2A;ns%#$%`yW|U#jtiLg;{nPYrVBNBig4817I*g3}d{8Up&+GWL>e_~9H5iqY
zoah8?z{%3AOn0FPDNM9zve-@Z?!C^#>JD48lGSYYCpzK-ZP*E`*bC!mAfBYccB%=Y
zCq7~kXvvkq-kQ6_4E9Qwl$LQ=#VW)I<gSQO1}}%GKsn0dBUCmhkJCY%K^^adifO)u
os6^XozJqA@4}OpK)BXXXLpn<Hat_nbNt&O+W9D>573*021=$?1lmGw#

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractSet.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/AbstractSet.class
deleted file mode 100644
index 734959c8301a7655f23e3e4bdcb9aa0bd6323b6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmZutO-sW-5PjQL(^PBg*Fo^&t@U6$n-D0a1wru;@!)M6mv+mV#bnbT=b=BKKS~@Y
zN|een%<P-@=I!j}<9!X_8YdnOJsf#B7TAq+rd=%191Nf6s@_Uz3W3wX-BPY(U}QEA
z9%f6Gx^Va`&|b)5F}5#?6}JL@u3qg*jf@dE`xcc>n_z5>A(gfn3;jgTGwI5ll;{8R
zqRW`6_tE5L+dZxzo;{isE|;mRJ)*}+7>B<oiE<St&`E5Wr)sJVdG~*`M7a7|k#^-x
z{|u%kJ#!nc4F$S&o9L|z2s9{~^v5keJ5<q^!sFbA&$)v=Lied|pi5Cz2k0@<{{-UT
BZ8QJ?

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/ArrayList.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/ArrayList.class
deleted file mode 100644
index 16fd89d1efa9aef9ac55c0999aaa0d88d72cd4f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1329
zcmaJ>+iuf95FICN+$5!3+O#x4Tdv&@+LSvqAyO0t$x@|Cq~d`-Z5$JA<=B<Isi42W
zAMwBk@KK1f8^<w?!-G9DXV1)>-5vY)pP#>o=z!`by*BBMNpDShXVQC<4h_mRgePRv
zpao`CJ{y!}>b=R1&iDndjihjEZQperTMFN+tF?Sr3_LDJfn(5CI<IlksW&ybAOkTx
z@w?&@>=nlgk=Ewt+!pdXdWITDPs<=vgq`8Jf)Rf)Xvy|H$%PjhREpZT+#A%6duLEn
zR}@otedpWp*EtLnExJ6E)`YcayS@h@YpgQfU$P*|Nxu~Y912RTa+=Bj{sEgah_Mtx
zdeSmG-9t`Azp=Z4BUJ}0RYMNAZjcQXZI@ZII#Lt!%u-FpxxC-U)iMR(nATH^;3~~=
z4!m684E+ln4UWj+0RWU}x$b{P0fo2cTz?gfasObHC#`2D35z>(78}$2;#k)wT)Yy;
zEIp(@8lA)0V`+{d-Ko_JWx#EDBtki!#>8SOh!%Z+*s^UW4C{&FZ8b8y=Q<H6{94xu
z1b4-yMhz--{ZU{$ABC%CTu+edu&=%#gI1>>QoMvKNuUX-$e%8#BL6Ux5+{ZA1jiaN
z+B*M=NV-o3WoUu2cor##-@yhDla}Bqn~!V(Q4xNImf>BC@Rf*noo;B}O}eG+Dy?Z-
zqIGRIB72)QbzG)9alO0n%5*P|x8QBlP8=(R59nbWKZ5rd^(T6s=y*4d8NAAs{7R(f
gX{5VK&tm=_yejR-aSbPNK+mBw6Ycl~z0}dGzX!oP)Bpeg

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Arrays.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Arrays.class
deleted file mode 100644
index c89a7a36f14651c934ab4f1bfdb1ffba18a916a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1993
zcma)+TT|0e5XU!MT5c-d5HBEzXv?h#qS%%qNsI<i9@6olc?wL$FtydRb%w9zgCD>T
z<+$1NZ>B>}J3jsX`=8xCIXP#~pTEC;6VWD}r0HXtJ{goMhV`&jGH5uH{cO-kvk|on
z8qN5JahPVhZmif5vg0O>ha4|)EI3x;m~hO*vEkT><G^v0Gn4U;FM^*zt`^kKb0?=4
z)w5P1P8s*Y^Lo%~M^%I7i{*T8Rw?7}mCKSmtLvf`SQu2RQr2|UYQ1(VtmUl6x9>p|
zv>K5tmLJqnTUK1>?<`62hHfp_)s{&?anNdg3cJ>uIt}YVbm>)t=<F+B0Y2oztSf>y
zuY~78SQdn7LfAHh<HRDP`}*FKiBos9-+iP%$5sA6<)cDe$EVucu%FX&JltSUyD+zv
zMal*3ukQRYu1{5ew1Zkx4Fr!yMU=}Up_J!)P?m2&nZ5~C@hecaZ$ml06RWIlXPV8%
zxg%e~TCH<jJPl(qoHD0;gzDO|$KxrJ${ru0%HshQ$sV7l@_0l=vd2fOJRVY!>{Tl8
zDy}P%JwADr$D=EfJ-!6W<KY$gzxRQw7W*AbJR2C}72O}|-0`aq#L}RKu8Wqbpm`iN
z`I%eR_0D!(hB&QY&{n^;^446*FY+oSE}HNf?dYuPgf)JxCJ&-0xNL63&zeEg^18`I
zRes0n+7B&~K|}ml6YVmGX@u1{jZz9sgJa-0H~~(AQ{Xl5I(P$|25*A5z}w&*{*Jq>
zhiFFDzn8?b65mha2NFL_;zu0M(Y*ATqsQO^xClN0m%yjsa?<CS^m(4d8IH5GB6(R_
z1=qlJa0ASNo8Sv@OSnxh!5#1w_!`^=-++0r02aYLumtXdZ@~l51TD}`_VteUwM|YE
SzvuV^xk-G;>WHg`==dMvfv4mE

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Collection.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Collection.class
deleted file mode 100644
index 476562415a312ceb1c2157b095e69d6fccf4a943..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 841
zcmZ`%%TB^T6g`7Ld8nWQilE>#ttR4H2nivWkeIlDxRBLQ8YmfCEyYAX&4nM}M;UL2
zXP_?HnS18UJ@?!@Kfhn!0B&)q;7q}}f(wS=$ow=IHdL+2pqQh^%d7h#<7bA5Zd)!l
ztr0_7eHik0UJ~5umma%ALwC!XM=@Q);jZm4WK?a!8M~$^HK%x)A=)zg7I()E3FUlA
zm3E_CC8pxqHOJvpKw8y0>xvAj>I3^zi<S1>dWx#rX}8Oo_amFU*JB8)B=4CCJI0Is
zPF2Qd#%n?_WT)PxuevP+nKx}qUdj8PRj#U&j3gj)6#n5|OXr?=bRsU<wD<Zh_aR*v
zoZ3qxdZH4Iw=owqkjQ|K26ekf)z&HvKcnm3mk>Fgt}teukG1TvqZ{|8poEEq$s2F#
z3@JJMl?E^*SKkD~?gE-=gc%qD^li}dO9biBAq3DGh9cJpqH>KPPOMF01+Ycu+ek=!
z8_7AoL-;Q7XS_X%Q`7rtWajuj;Rj1`mg2*u*gMay#CaS^z2j-Vf>$TiGO4JD6B(WU
E0b}XHlK=n!

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Collections.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Collections.class
deleted file mode 100644
index 462b3547feff2cacd867ccf50a6c8a1636a118f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4895
zcmbVQYg-dX6h0%=2%;him0qovmT-$&t*wbEm|`0Np(fBmFLp^buynJV?ryB~r}aaB
zKz~#p&&=#j&g=y@{h$x;IWy<H=gd2o&A<Qs{SN@#0lxr$6u@IJwzj$5+<VzrYcjaB
zacsOYO8vmHOARw9qqkulI!4g<Oa@cBw=!SF0poJ|M!kXaC&`En%jW^E#7uHlm~?Y>
zTTi-a^kQ?+QkfT-&Q>hP3aSi7=8C%vMt#={F#cRDL76+3E6qpJZX3>FY3tzFYz5_N
zd~BuJELX*ZV%$|GVQX%;XLv^7dSdLeVS=ZIsVu3)69<-Kcqa|h@LER<ZfEeIWfbcS
zwo*CJnnThDwi#wiR=*%v;D0<~IY;KyV#Ms{seDdJnHnnU3(_fg<}1_lQFaCYsNd<>
z_*YhQgkE15PTTE@1zO2TMwCy8kPxH(pGJ?tbfPKsI@i~oVKT@mqaDk(vun^67&F|<
znL#RvuOZ(PEw^{V;AVm~DN^i9K6q`Y46z6msU03?q-!}0=4sBFYumWtEY~R)<wRN@
zgJx>#{OTRVk9c4M7_4M)Al&IzPGi<cWv1ykkvuhgBxONtq-(rpaMp7JBS0Nrr98!Y
z2vL>Zo|_MrhnAQz?wLK?Xql^ASq~FYlLaO%#eD|%he?bDakb&Ji<Z+iUvG69{R7S`
zm+o+9@1<tjp{t*HUN1Cv@W3Vw7Yzxuh_R<^!w>2)S~Gp8>$a_qW#C~rSUtQYXvYSQ
zNVDQtA?B=8_jGlH8z2@;E+Srjlp9{T46ajB{1T=C<fXit+Chy54ve-2=@z%*;_-WX
zT1$*qso6#^gGDWUWY<Y3D}#+3RHEVGZA<y+E_^^xR#H?qC?RgrxCjG-+S_SRr4S0j
z9QH(8419RR7K1-d=wisn%6?@%MY_8wHf@3UyQaBbZtn622;oERsjGwoQdfzyp@ABr
zx7^C0^Zz)i5UEU)UIsJ%iPJjrT*vy$Y!9{$gB<UJ!SJL|;y&CsG?P$nj$2>pUuzWE
z6k5<ooG43b=ZazQB&Xtpv}ig_a5S!1*lB7}9cFOO?DhhDC1U2wb2J>9aDf*y*u+Lg
zn}1A1lZ8xa;kXUsE#-(u3z76h1v)*czuFM`qm*&Bk{*7G_?B~Mn}LhZjp&I(-xYMG
zY)jUS$}cdo=aeiMTu?b=cW#BJPgb6=Us><LSR&f836)8-?LkT+Nii$6Y;Apr*2?pS
zR<1X=;MClnW%~S;T0cE`Sohrwozzb&Jbc-2d2JKFKd))}BkwZ?k1;wuN69CR*jCky
zsgcajn@+!L;)fePL>ZLmMKU;0G$pJJCg3he|H#sg@j;yAp+$m4j7Dv7cxVp~GEC#L
z>UqXV*ykL_Ckd0JqGClv#v5+mYne|i{#`XWsKQ_7zX0IHGx#BZIB}@36G_4+z~Bu2
zq%Z=r_-_=^JBZG}S;Pf6r|=l!aX7E=1Qc=91-OW#$KVo7D$iwsrxd<|_$o{*JR|VC
z3SUD!8=L=L0>7`ue}LmZgpU;d81Z#chh%;O@lCj;{I?N*3ZE%FCvZ{WdBh7b{{mJQ
zb%OgBVM*a-#3lR*Ci34!d=EZX_&(wXG5iHQRQ@l~{}nt^xQw_0j}@*W{u)*kUPb%_
zY6^dYcnzK^{4L_|Nc=kDXC(eQ;*D7RO%ne(`nO{7x3&1Q@IAax`5L%dP1sR*7x549
zqr!U_Zy$bA_-Dkwz^@9wMEn~V3LhYDL0e%HaR&|+K0<84vBJM2wxO%AgMYa~v%NPr
Cg?Uc^

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Comparator.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Comparator.class
deleted file mode 100644
index 9f03b7b8febdc7909fb35b19f3bee4c5713a066a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmX^0Z`VEs1_lELK6VBkb_QNX2KMCq+=9fSR7M7M4WF#UvPAuy#JqHU|D>$c<PvL4
z5lv4<2F~Ej^t{B9QjjiAjgSy)AOeZAr52VZ<`gqBh+;8HGm4Qx!zRQE(?~l^Aw~wS
z;QZ2}<W#rJ9H1rq&R|C-mgE=df!xT*AOd!3X-Q^|K0=O>K>*zcY>W(y3`{^TGcYi*
eFfuSRumJh2ARYr7kk8J*0cJx)I2pLWJZ=DRm`cq6

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Dictionary.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Dictionary.class
deleted file mode 100644
index 2defd43ecff7d7b5c9bb6d9bf1baf42e3d30c9d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 627
zcma)(%}T>S6ot<;vFVT6s?}N*#f>Bg)}`3cl@+9di<U0j#V~}a`6=n75FgEj58y+I
zH;J@?rr>IF?m73nlRMu(pI-oOai-x!!zn}A6uyvs21Pd}4C-8b@Kii8XktF_W-?Co
zE1B;+o-=fG<9TW=tZpQQ+a36k$3shs!0$0sN5b(f8HEJ7*pxG`$HQKq(iQG<kNc9K
z=NrT0Nt#t0E*Y-$Y_x0nPWR<)%5B;EyG_1CXq{#l)JvD2Mbvp$(D_eRJz)_l!<9qs
z1q=GWb^$SqnC9?)ojob2_19wzwNVg-Hh&Z@O=&y`J6Wz3#y82<8Ct95uRMlkTFz}j
zy#zyvo*SspmjV?~8MaVPPmQXHuA)Y6ol+%ilitbcUD6FSm;N5<eH<)xi}Yd6KO#m(
KYU4O1c76fudY0}0

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Enumeration.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Enumeration.class
deleted file mode 100644
index c85438bf7d813fc12d8893aaf8937df4013c68a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmZXPJr06E5QX2MfPjC6-T@l1R%5qT8VjxLR<l9Kx+Jg|&t~BPJd|-!3!}wkCf~ft
zn|FU)Zve*Vx@f!T5PC;muJS@KDNaJ^lF$gF9U)NSqCb!@2%}}j&peh~CGmQniG!XJ
zyiJ-YuB$>2>@eCg!@?Px{A=g`h~RJXsyK*6D$RYLsp=#OuG3tNYA?d@Wm)M|#$QV#
h{e8tD5G)f6u$m?Tnt<sx9K+q3qGjqmdGKE(cmgJ8LL&eG

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/HashMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/HashMap.class
deleted file mode 100644
index aed7f35927743dcaf712a47d72a7256c303b8090..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1163
zcmZ`&&2G~`5S~qwxNTY>{Rdj0P>Rz))7(&PMXIV+L;-O~<O8=&v<h3cc4Rw|+E?I>
zIPd^G6yn=;nmCD(rJb2?X1<x79sl|J>o*adQQe~V7Jabj)S{Y2XN-!j^kv*&RIr=Z
z6^~KgZfdb)>vO~Ye8We)HjJgJec=N~gDY*>_jx=F1)~$URX^{v91o}GH0HwHPOI*8
zyt>mciTOz0BL~z?MwX1OZU^z5vA^N$i<r^zm_c#BU;Em<5xv-{Bt4`dM$0y;R#1~s
zsTcS$mwwa|VB5}O(ENiT_&;WN7wI!AmUKlFOo|pkccB!c{rNjr5mwd1Fn2D7;x-uJ
z*1H*%6RJW_2_7<9f4GOo)esrL10QnB&g`f7L)^9X%*qdb^Gbj)lbv}CPl1l`-Xl#O
zG1{AnxD1rStYzRM=HNdr*W3!T7k(Tjwd*sXsO?r~H|FR{$Li`PS-0@hZJjU9+{?fk
zDXxod6o<SQV+$v2Dfc35_T^HKkav}El2{qk+9H%($$Nt`T5SizuqUpi!l>6i@#s6K
zPW9GfveV@sJFs6<EY%WTZ;FF}(WbFyo4{Kdbgm0JBt|(}!k4E4e$+DTB3aP1Tpr7n
zv0MdOf}W!_XzTRI;E(Bvk!9ML_&1?#(YC>NXm^6|L3>J5o@cP1r}Fk;A5c>7#W?>Z
iy)rz9^m@Yc2HFw5o!H0F-lhCDdQ3X4&<V10RQ(6JX&XNP

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/HashSet.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/HashSet.class
deleted file mode 100644
index 679c44b565a27b0fe7916b5a8519cfc0a5503e42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 744
zcmZuv+e*Vg6rAlXwzgi|dZ}8kkRn*0O({sJSP*=u_~6?%UFu3qG}#LJX+HP?ew282
zo7yN6$efvTGG~^}=hyoOfKwb<*tM`{Vc)`mg+qp1OZrl^8Pay+mSMxbdf+d-IabnZ
zb^^~6u9AW8=w7}rM?P2MP%za0pKBf8be*=D&f2{T{Z+>9X~+@1)5V-rBIGIv8LD<8
zv8@;D4nytVM$34UV<g`w0tN0dSTgE9KB-s3@5tT_e8r_7F;wD=9`{Gh>%jvZ#c9w;
znh%FM5ZP&(3&msbLWWt_6P#iZ20rofG)2;Y;kng4o5W7)?ZipW2ayW7tNKDsGADX}
zG-J`x`}n{U&SX#q&AtdF_vD*V84CSi9J=B{dX%ep$)kJnIng)8uspl4xIsssX^Ail
zrI}6!46BC!4nYSu>Yo(Y149aFdNRn;-&7)=gGH6bIeO=*PN87<e5@A<LH&~93t0S_
oTcT<iD@I>M*<b}#gKLCSzjdlMVtq5-SHl*~rQ(g-*fFgB4J2c(Z~y=R

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Hashtable.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Hashtable.class
deleted file mode 100644
index b3ac022dfc68ae2782707c5a72f47a80038b1fd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1408
zcmZ`(+iuf95FMv!oVK*kds=!SP>MsKp<GK7MM9+&Q9wMT$^&oPuu8XV?BJ{;wV%Kz
z@xTZ0QHZk}+i}xWkusjyGiT1ujQ#iD?>|KJf+{w>v+2O5_ck5cRJJHn5w1{Gizc1g
zNug;`+No(X;pqPb=ko>Yvr?dhEPY|!vJOr)MB8O5@VQ0nBY?_jy?oj%R}C=T6IZ~1
zs%DWbddHovx-|Yb)cL_Ldls!Zg+z&CH|TJmDdD-$wtd@KrHC?BAhKNY4tEuZwr&L*
zJ;1g+S25uNyBw;P%x#yxo?Y;kDi@$>Hi9&n44`}_^6OmdZgXYP?zr5+6_RwQ=Rjlu
z#nEJ+pR?XMD7pbC4#rU2WC;6mopeT%f-~mrczp<69m5zxQ1OG57Hx!(Xq2Xh#dube
zEy<aWHE2oC1>;iG&g=EF%4;ZJxb0EIAgb?*xi)m8<|77E5g{C|jK=i73<l{ce~`C-
z15-?F2$pc?SYzW&)9IPM9vCK@yOw<9Nr~AGwrTU0qe{3R8U8b15*%4Qt0V6_y6~$~
zKfF1a=9pMDq4A?IHCaMr;uJTCwI{fbbl=&T<mEw7c%=sS1(V{+L@k<bc!A&ICqhEm
z+$V@s`eaYPp%yI;U)1;rLmEbhs<7z8FyutZX4J8cD0xH(<;kKHP2iWNNqkju@H1rN
zN!x5_r$Rf8=nS4ybO)KUG>7Lr-KBfR&eKACzKHlz!e55JLaT-+XKbF<Lc31)<Gc;%
z*d$#qPg}Gd#~;AYCvXqpJ))tW9r%yKyj^-?@*OIedQYhs^E|`T^Mt<#zl3jTbgzBz
VybN`{GWSb`H-1fTz?P!7{{f3(R}ugK

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/IdentityHashMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/IdentityHashMap.class
deleted file mode 100644
index cc3e4d073944dc4fb3099213d6f25ce380374021..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1154
zcmZ`&+iuf95S>laxNRu(et{M!EyW?wv~P%5k*cVOC{#S8$^&nkbd_$|+QFAd=`Zj{
zJn#X06yog0b)3W~Qf7AM%$c*Z<3E3Y{U)MQI<x4VMei*-v8ZCvDWifTT^ZIG&Do_k
zqrBbFX3hR`%Llv?g;G^6dB3WIi!Ir6c^LVE(cTomDPJ|K<*RnJW}x{%-U9{B1|v%b
z7kB+|XwKj8-xDFD<CsBlw^#YvxfR{8S{ijthZrr`pe})$QL*c}A(w8@6kyxTVgUd0
z1FFqcq*e4I^!t#3o^6+@pr{o<z(_;^bmvN8biTOr257LIK|R9Gca`8ipyEfwRe;Of
z@ZhHIU84#)&xPHvGn*E^i(yL-YV{#+9s?l^Vrx3)Kw%Au!a&~{jdmswbx$b_Sb8on
z`~OKf=J}vexS>DleKr9_Z>K!D7)KWxtGk<GE#arr{5U(<c1En0;yUjHq0hS^mMvjR
zrDwy^tF(kKxsvz1qeL~;vaSbff{d10UgUShC#m$P8`rp-42Pfb3ZOjEOU`I_yz5f{
zEZI1hl87Z6$3X;YbDk2#Xx)U(LMN)|fEeXy4!=Cj<GWnLxj+^?Z5Lv@h|?1M92Ma`
zqGc0*Oizqmq17a>>(^<+#5ZHRMcYY!2i`7C@;yz}KSO>m?!O<`KacyppqGaCfL<kh
ahwzT*b#gw2_a>FMp?RddL~l`@qw+ubyczre

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Iterator.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Iterator.class
deleted file mode 100644
index fae0b967366a7a78bab4fe8ba9e9fc94b4b97e8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 334
zcmZXQJ&wXK5QX0mh?oC>C^$mWY^Yg82M7s4krf4<K^6ps1bH3A*(mk^911ZTgn*^6
z?Dvi4&GVcur(XaaGzIDcjzEJTHu7hxj)q{l-hz;iGtqLr$yOeuAIW&_&z4)YGGByZ
z5UyisQmqID*ZUqYv$fhK2L@~~CyaW7?t5$h9X*jC-0dSZHcCsA=pNhl*|-!Wsa~mJ
z7_oWvUj6)wMQCQ}QWHl0y+UyQM<%o%=yi%sAmsR1yb~+WKSu%J+lFBJ!8C^=>k`V@
L`$j6LW~z1t^h{CX

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedHashMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedHashMap.class
deleted file mode 100644
index 27d17d80c8c38c563ea7b92e9cea52d04c9f78de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 643
zcmZuvO;5r=5S`_#fTDsTs25EPDIP?wwCN2ZDaHe&2jXQd8(gf5DO(c%ng@S?Kgu|}
zG*FR4cP8)k&Agf2@1M^v0Jwt-1L_8x8E{S@XLG@&Lm+GRdrgl(#_X$*Hq}`%2Q#{)
ztw{2q^+4Y(1r~;UDyWP?M&QPF+nteXd3bu3v-P_@a@*F(Yg>*M=CH+BRVev$At@IN
zj|LG|sm8j1ifQZddB%KcHOFXT$|QltE_UTBDIkzH(Mc11;52@~Xh@(OvbXt?b%P08
z$gYs#2Z8#Q%WIA6hL<}j90R9NL!hT8+wJ^s?(M*w#P06t;sy7&u9TpXFoEK59)&*Z
z@c{Qy8F2B+Cb9TdT?K*K=0^U|IP8XrCAjJhhK=9~2&C{!<3lK5%s>`16?1Vk;+RLY
ofO!gvn%~p-K9qDkfWtL^gjpGsE&~-fUgIaIT~(;UsjgJ}1&BzRzW@LL

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedHashSet.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedHashSet.class
deleted file mode 100644
index 6aaaaf1fb676be2bfb61ee3904899cc218a32f2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 457
zcmZuu%TB{E5S(q(nidN5fe;rYZs9^WlPH&}6_qM+2;%M*tGF0j3JC{3jRPOhkE(E-
zNNFo%t!H=k;aPdJ{rLrOj|+x#hCai9VaPBdv?Hly786?jY<l}b@cdZ;O~1IW{P~)H
z@gUEn3dTk$vCO2=VUg=3a;15er-E?(e_ixE31e6M5ltS-QHtwT@U&RlNnyM*{gHpZ
zB_b<ZcK8F%wU3q2f-jT^%R*^_M5K}{`R!OjH!*p-6jQ0Jy1`uPckx=ia93<ZxU3i3
zOB4EarfMPdYR(EG3|+i0hA?vMfg0R^&_L534=wu*o{igJ)+_L+!cK)<%N|?5ffH+`
K*Tbn}&i()aY<3s`

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedList.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/LinkedList.class
deleted file mode 100644
index 39f1235c5f7ddf4573933df566ce3f74e66f3e31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1485
zcmah}TTc@~6h1>~7bt?tMGGk4jjag9yVBBx5KNjh;i1L{c^bAO860=xc1o1QKjwo!
zz#nD&X7<vuY&A`0zjMxa&YbhjOn?9R`HP5lsOivKhjtyRJJfJ!k5Q>1eW{y_3U2iS
zql();<LA8A*HYCE0;PnfW#HFMY_cOyeXjeVV6>XgYizzhtT!!t;#BB&GVEza^KLb&
zs<?kzJ32W-(K@4|TLqhu17@2WVmTCFf^!k4O+{7|n&91T>|coY9<FBkE4e6VfCFxv
z<psXx((f_K&HBh_yeBU(5XNs|MP^b6u~O6l0Q~z({X-wH|Dy>QOKxj~ya=w12qv0>
zQuLJIA=-puW};TEt|j=bu!WwXZ6tLs>6LdNlWxl>Xmb~Hvy8YA$sp->#kZqRBeaE_
zWrbsHC9G*BVQCR^9bky%w0(Qo+CxEH3aAkecO}|DgH3aPJQesjI!6clVaUImKB~ug
zgE{c;*|A(VhmfB%?H+F#Iqb^lN8@n!YVGFGdG4R|bjUs35nubl*ODtUQ`GGcE$g($
za$rW`CrZ>KrVMHw5u${=uwF(}ouD6jcpC~M&$gxiS#(XQZS!97#s<%J5QB^ZcYb?}
zW(E{fkI|fUTy87bAk!DE6QeOI;5SZ1{KZsYm&gG!-wCXfz+*H8RHo_Fz6Latv1c>(
z^^ARkZl?KjK=T=Uffnt)x9GP0R$wRlF99vb@fEt0`tJg*&}wS00j<aV-=q7f{{hfL
zdX(B5KoxRRy9%_N;XkHL+sBjmyG7e6zXr5}`HW6a=~?Q3ZtWMT{Sw+m3cjM(V2{z8
Ezt7rPegFUf

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/List.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/List.class
deleted file mode 100644
index ca92bf570f651e6797451fcaa55cc1b1092c6e7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1425
zcmZ`(TXWJt6h2#80tIWe1qG_qYd5Whde?%T=`eIAGo9%}9Utt|79ve2C7Ohe`qO;y
z2l%5Lzg?0gLU@4P@0{=4&*snHU%!cHkJ<*kH)!9W7Nf<$`DruCaMNOBI6?R7YxqOq
z&x~?CZx{+^7%(dF<4bWZnywfQnkVO%b}ww1lH!E6FG9~}ROaTGGYTEIX+?6x$e%ic
zp$JDl0@YGU?T_8o0hmVU9s0gN0wr#q%|-+R@(*A$;yi_rZdBxFyRb3UKZ+CmKBFv`
zB9xHz?JMsZxfSAa4_%j0C8}6e)A3vvB|F|wnQWx%+S><Xj|iZA)aUSaRJ}5Im0O9X
zO@-N<qij#?^W)@IG~DI1)P1Sv+5$ttU_YTm``bvk7-Q~21Q#8zFGoJGL)m95np$$Q
zvOAWk+MEd_Z7a?s$x1cMb4&JB*_KnSkdHAY$(u9m+uu*V%-Jw3Wx*9eXvM6e>j3GU
ztNyo6#|a%aq&`;}?^{h*ucka@kM<`wI;o8v7{TaV${DS5Yle*+Dk<XFxYO?L&+hoa
ztSEIuVlT_5-pKFSM~;i3=4CPs`BE9Js0XVHW3)Q`f|2!vGugc?BSs7OW$?MEEaD?U
zOGG%cWT-Pod37#R0jwfe3v>he6}qYMs=~K4z74zvyO_TYT#EdZ>5i7)g}jo$RfTI>
zzX5zNp_lyoQ@Bo>D!&Jj|A$fjkLa=X^8|KJX-i`cyhf(R+rXtM{ti7;es`m@K~2ry
b1HVDfHGTp7l3r>28a*0!>J7bB9eei=;{ZqV

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/ListIterator.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/ListIterator.class
deleted file mode 100644
index e916842c1c8adfffb04e332d433f65c429293ed1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmZXQ+fKqj5QhKZ&~gw31U$V!dt<p)LgED`Bt%UxUU;|C4VKi_Y_|>1=7kU7Lm7vq
zAc2cL%s2o3Gdn-OU*7=wxUz9><HE)z!G0IXgIsDt(Q#i1rN{&w$DJ%hCcIEYbMNtO
zA!quQP@M+zNa$2aLfLVjN6hN%@T6oG#A!mPd~UDRmDM=%<<gjs35`uMr<Rf*amHR;
z`-S&Javxpiu<|NvIb6=jgzppX2BVup;qVZxNvea;8*8bAj@5vjhTM8>8mDR|?}Lzg
zXib7dZxq+7&l7rP2IlQ<meAZE4x#<8-MCl;LV;J2=Uy%GbWsNQv|ux>FfABf%Xxi|
gAE9CN$N71Jrioi<Z{MG?UuQRF&$V+GJyYTA4^zx<9{>OV

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Map$Entry.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Map$Entry.class
deleted file mode 100644
index d91b3104a06458e230274685ff946be3b6d8445f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 480
zcmZutO;5r=6r2b23qeuAkGnD3i}eh|3(<sB;{noxw-q;~WK*;sCjK=J{s4cJ@s%`0
zZ4aB5ncbN;J73?MPXO0Ax6rq6N-#r}`Raqv7w-K^zDrNbIP@N$S89=s2+k}DW0~cN
zA{fG*`^?#_38c<TDk!LQM_r1lPp!2r=E2D2!zt8TE_F&6)QO+ie<{=DWc|V`o5GzE
z#$$h2-4oPsH`Ql^_H3Oe3w0N1cC;Vl>s9f03ulDmZ3}r8X^;7f+c-<O9;2L{X&kF$
zqGg&Y&fEK68KL_}ZxRR%?i?^$93Cyk2BQW{#?~)vGj`D4-S08(pbPNa#{p}arLu>^
Qt-}#ccoqtdje+U>0GRY`!T<mO

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Map.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Map.class
deleted file mode 100644
index 49c2bfc064ac0c79733bf045da947ba286ddb6b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 947
zcmZ`%+iuf96r61mJ4r9}LN7oI6iTs)MBoh(D-w!|R0YICsyy(v4Xe~;YX@H<l~3b=
z58$H^<BbzFad@y+XU=%e?CkmT_t$R#Z_u#e*l=yU5~!R7Npvf)b{+&O>S!6qDi$cm
z{!b-Pa@=zP+mFv~MhRK0zY44l!XS};5O)=^UFXxa9LuJb!La$|@>&g&R>oSNviee|
znbuGx0;kK^MFD|Y&mRUdNhAJRbuPLs_oCmT$|$AEyCo_`5w{4@e5OUIiJTRwn{dn#
z`%4sa3MYQhT3|b;q=~PapXI3K_5}_XK(9gh2KC#fT^VR4BNH6S)^~N=%Tm~Ka&Jb9
z5O21(h<Q|Mvtf<10Qo2fbBs=?HM91^fSjZMv^?X4399Uw&Fr^xR6<^3lGF5FCuSwG
z>E>r+LH$UjriJR2jITQ3HzwwJ-S@?S`%AEPktR^@g=sWUAAOxYFynlkZ4uYTEYsAB
zz~<s|3GB>KCUz|WffcSduu*1aumPS`)XZ7OsyWy4a~&Jx-y?eko8)a_dsgqTzJI5`
z%X$y{v;G0=2Y6`o9^r6?9}$0yC$st~>*G89XRM#+^G`B=DCG`b;M6#Ii3-m;6-xZd
GR_z~WUEbRO

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Set.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Set.class
deleted file mode 100644
index f7bbb046a204d279476a576b3760ae1d74e08570..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 829
zcmZ`%$xg#C6dbcOE&EpXeN8}6&a_lQRgsX8I23V!lW8poG6|$E5_}p5K7fxxOx#tp
z91?q;=e;-M=kK4-F965bbFl4T$HA_^K-K?H0{yOcA>jDc;`57nxA;~dSq=ju{h%t4
zb}yggo6Kk#JY=r!pH$goy_n(~6-g6D0<*4H=hTd^GZ&3`Rv=aK9|CD=5gRS_B;~G)
z**uw!3D2TPQb5}E?z%gY!T2fJ0<PPG&^u|wy*p%%Xa6)OD;0r+8;58i5vk|!joOBr
zcF(jHSZFx5ZVI8+wCsn0O<C@JmfO$QE3$#DvGxz|!1|4wry>>Kuw`=}3$gpbvR0Cp
z%E8=FqI#`K%`qe&W%aQTR;ad+E1q=UP`*3VF_gBA=8X@P!dg^T=e}miWJ#H$c+3K$
zcG}iEg8~zOr!O$mrnKuO1O)o{_4BEX5AcCu5a61CW7i~7b{)bnStDfiVU*`%7;oVT
zizi!nig=oNP5umVx>08qbFKJ1;|m>lk$9;C$LGs`@CsI~p0!53^;j=8)s<~v)1s|k
D_vpE4

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/SortedMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/SortedMap.class
deleted file mode 100644
index e673c68a3b652df69c30e0a90a26a8992c5791ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmZ{i!A^rv5Jm6Q7Fx8m+NyQq!o-9w6xTw!F>!;&1*ZE~#7cvud3~7pYcBi%Kgu|O
zQX-hZ;?A8pGsE!t_5K0i6303YbsXs!5ez?mSqUjrED0lXe7g{@!b(&aS=WVQ6FOcv
zUka7TfN=6pnsff(+7nLJ*2(NntO&N5^CGdFTlcd?;48ZtDL3_Ese(r?X3Uw%Jbr3@
zC-tUTJN-EjX$fIm)33Ig>8B~Z)-0oy2%`+$ehTGUxxpJ@_`833Ekes2Gm)T2;wRB_
z+^g!k)0)_%nwCehOYi`tnG7#Zq#xXb5#OR$e6Wl3a)iO=fQ3cqXVKEUgzhGh`5J-H
y;CG9E5v@sRqQy#M)qu{rjZUEr*4x-AbeDDSkKRSU@b}o?FKcGz<N=0Rhl6iSW~)yC

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/SortedSet.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/SortedSet.class
deleted file mode 100644
index bdde4bc497cca4349d408a0cbaa4f26679a9d695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 634
zcmZ{h!A^rf5QhJ$1uWWHZPj|w#1kA8&q8`J^<?4!Uto)CrNLt8;=_6H0emRq0CpvU
z2^{|UXTN`E_Verg1HctdEF4)lwlE>sQTp;KGNICpFmc?wrFauwuHwYI(T-2(h4Eq~
zRGvw~=|643#ly^>a<jS4=b=;t->G<sSS`H!`BFy8Z&vD|VVWuV$cGto?l6zPRzLX3
zvYw?V`U!4JSnE+npB3m<Q*)JwlagyZ#o3zq<IULhX$XenGK<hnM9~!lv+L%F(`Kov
zl$++5O{^WJc^1jrIN?PP^foSwXCaJ!Uq@SnVOg!+iqNk$N@WrV9salY{mm}l6$UGl
mRR<R9ZS=IZS?^$1>pttjAH9d6_V?L8sB30c<PpYY!r?cyil2V~

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Stack.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Stack.class
deleted file mode 100644
index 16c1fbe6a6897addb44313de075dcb1daf2f073d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 406
zcmZvYy-veG5QJwFCr->y0wnZl(76Cp6U$wYkdP>hQqUdNDO_UglXFJm)hKuX9tyGC
z6$mB8Ni(C_)wlQc{qYIl8s{M<A*O_Wsw-_XLRZ8~LSWkM3*kcCujQLeN?EOvhv&5_
z>^$C$2*X^jDrwtB5eDLMF^~E2GE*DEMC_gE3113~QX4`~y&C)O0G^m<t7KC!!gL?P
z9pN%v-0YHMK5DHllO@yEP0An{qeOY#Hif#?B_l?;mBr@j_cp@Fo#;kfOc?(qehFqE
vboj@BKC3PQR*dXi$hw08cZP^K_5OhU;Xh9}!ZCMe7-8&YeDegS&Yk@L$8lIZ

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/TreeMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/TreeMap.class
deleted file mode 100644
index 826beb3d78e686a93c67c4053067171979de54ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1642
zcmah}ZBG+H5S|6v0}3iopeQebfITY|d_{UTA&n-c8b7q@2fuC4wH_{a&D~xT_!s^i
zKllUuQO4Qr-S)0MVw!a4<(ZjhX6N?L-(SB0-~`?paAv?81I`Vo8DJ5}TaN39I)Ul3
z*&(n|{&-0Tv>FPBR~z0{pZZjIeogx3T29ZUBJ>%7oot+S)Na=53cZ{}e4>42+#EAn
z6~tHCohYW1bhkWTu&;6CZl=phh0g@e4RXUyJ`gC_o-3&122FNNU^NQo)a_M2cQ2VO
zYUURLi!rK0c_?FhOb|HCLJtR%Oh90^j08;NPhj5G(;`qRo7r<Duziaw8Xe~R=J<h7
ztcx)=T{TxWu`B_D(+HUFhvI^B<c|V@vkd-|^dpMt+y&VYHZ*K1@3Sj!fOA>T$T)=L
zY|f}p08h_FWc~-cZpk4o#pKm4p$QqUjoah}*3pq4$oU78lj9t(%JE#pY^8!5UhJ~e
z{@~!4EBs;Y(-ahITb0Cp;7;wolUP|@1uF_c*hLS4T1Kz8PH)(pUR44IYJj*EiGq5S
zbwRwm?~KarCSYdN%Z$bu?5TzOUuxWYu2TQBn&*?$I~lfmBIiXn5I(g9rqF~F?#XTv
zB^q)IXqU6v(CB#87V{m-of~Dv52fXWzRlh{9Jghm?K6gTj^(R^J2QHGA_soDBU^$P
zft8V6Gm5Qhr!^G<MTH&X0=qz93a0Tl137#j*HF)cfs#CD@qZ5GDVSG!LF)@jU)1^?
zl<vYk6}JS->RgG=BCKkh%)bsLt#6=oA0B9Z6Q!*&eH+qsci^GMOa6O_{EtxIkN6*8
x9@)nsJl6O!N+vwfdIhDY3I7r5$57S&6O>Njnbx19^dhBCMH6}nuhgVo{{wBfn}+}Z

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/TreeSet.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/TreeSet.class
deleted file mode 100644
index f64d855bb9ec360d54317f4aa1ee160703af93cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1439
zcmaJ>U2oGc6un-zrYqxPtQ#9+D;r-4W6StPw5l{soiqu=Lna=0b5k=sxk;6{L+q#V
zzz^U@A+DXowbFq4;Ct@zJ@@+9>F+;3e*wTDymR2C1Fsx-?Z6uc-V&&HdBkOpz`Fb4
zf?iU8BDwH`IFW4lk&ZjwX99}>KaZ%KB#eMxxvhKF?_}kIM(6&g!37Itr>CoHuF}}B
z>yG2mm?l)liQdt!=DPc+nrW1(g+O^8M^)7Y*WEMK6-Nu0)WutN>+IA>spDjg8(cCy
zD1kNCvm83j^Bn@4l|-gNU_Rwn=o`9lO2FZ1e>9dqH2y-M5yp|EJW2_y=9Ab4dbp)V
zheNz37e`XCp0H7TiGmBEU^Kx5@<&3<I9&Lkt4a<RT;Y+@O(z39Ie|{a9J5zzTVZTN
zFLu?OYE;WA!xxq~-xwY0W?n_J%2JeWYYYCXi&hG)+YHSMQ!m?=wB8<p?SD}D(?gfP
z@+3u9TE#~DdXRQKJS<+aplTQ1NgUzbeDC((&wAFgW<MIFGNGX~kImvrepy1tN}dh`
z%Re?A`vFTh75qwP2{eOvl7#Gp3mjwVEMW{g9H<YQ!1DC_&Ix>V)0{ODft6|Aj8kN_
z1!ffVM(-`n0y{up4r=(DhXwreX(6hEgV_e6IatJ~4o!^Jdd=jQG`?=|4UKOad<&yx
zxNYzXMlD#?I%{x8uj{a(*SokD{WdYWm*=<gzT40?{C$jeVAtRW7(IkX20zB=NeR2)
c8U86od+^NQeT)uD*hj3+o;h#`&oz4S7c8)7bpQYW

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/Vector.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/Vector.class
deleted file mode 100644
index d41286f2bb715e89ba359dbd69ca4bca49937abf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2551
zcmaJ?ZC4vb6utu?n?PD91(b?yQENBUHuYUgN=-x1C@tDV)Z*J@Gr-_x7k4K;wtvAt
z<2TRogFnC@<?)%>$+CpS!yz;Gb)M(mJG1}%``6z@beF<unxq4V4jqyX9Xa%iL%u@;
zMl-?}0}-fAt~jI1d)r6+8L#;~IH>LPj)bSy8I?QoAmC~k2}V<U_q#3VDmJbe4g<xA
zwHaOV_%ZjSdfpDa$RuS{tjj>E4aB+ac6FCg!8OaItA%AZIc}(=Uu%ZGkMm?0tZUoV
zd|Mr-Zy1M?7arp%6*5|Kb8wp^_3pj1j5gf8+ug27GOZ#x=!PBn0^BZ&AO^{%rNPLF
zg-T4N5jRGF4zh*Vgg7#84UW}wqkhV$WXlq3a@7pGRxlihh#PvE+&Q*{9`bl$ptuZ>
zXVDfS+mkAea%9jKzwPXw;{l9IIgxD*e#YmqYLCLp7IOoATts`$77TraKI!|ujAGSF
zhKA9?h)5Ql?snpB4oaOXD5n+lS^4nLddJ04W=v)=N8vM(37SPsM3hZ4&HMfIh}>c!
zWl^Wp6LH~GMhtBtH+<jbK*gs#KMXJrjtU!5#L?VEx0*9y8fn$u2RC;FbAu{+{D8*%
zVsH)wiZO}WFuLis&sIOTA!WC%bKoDbsKAIK2BVlz(gn`TW(sVAu>)1XBTU3--cX4D
zxtGYka?ZV6!>!bZ1B=OV?Hs>bfSkCN)6(OKiG&_^6M1C>`^>X|{MXMh)=%;l#jiu|
zqmQLS9v?QtK3Z8)VFy<|I2a$<M2jLi@vyfoV>DqwKUJBltF>@g&QXu9>r6uB37$=T
zm{j_zhp6kysr%89gJWN`tra;73A)*B8HmTjK~F?o-t&=SemnHIzsn=3WveWxLkU{*
z8Em_FF~bO%%AMzdIuuHJ=)uEC_BD{->#e-!FB9MB#VX>S(i{^q8Dp*z9Q)y*;dvsC
z*Ar)R_nZ38Xs}i(!&*lGzAs-GEu-m9IE*~8B{jjB1o<8Pxv9_|1&rp*r^hrsF=B#G
zR9U2Ws!t3_(=wh}g!rTx&(jdmW1}6zsBcWR@oA%Il_u~3E#Pm8isYDmiOK|0_`Xii
z3@jD8fPH~3nzaVoEX_fq*GqPtx9jCJasjy)X(^Rog8VXRzg1c`ajSI2uCLIF(Z6cf
zt8~reyAIzGlGm_%o!&6|8}z2}zd<+6>RQ>ga+TK7xLe5a7Tr$eJCJK*@?Cm6wZ8-V
zyB61bWBT{$gVgUs_<dyXtkTDp*FEIb{MM<S`rSA3Mk+sm{K*);20cveP1rY)cf`Ae
z-InFONuQ?r&)~OpDi5Q!#ql|Pk@{`J?@>m640$IbYx|dD@+0~xjei1r$MWpj{(Mcl
zhUYi*ZR+<Oe4gsLm}8jw?=eX~z(-FD!#cJ0C$T@UnV=u>TQtf^`U(3=;y^zWht$JA
Rk!OA<>=5=zK%Sue{{WZBR>J@Q

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/WeakHashMap.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/WeakHashMap.class
deleted file mode 100644
index 85846f8f9397c3dadc866042db0a2ca31653379b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 989
zcmZ`&T~E|N6ukqxEwCbA@}Yu=B6Quv)i>idn-BwWvl<_ktO-vH&14-I+D$v%1b><j
z{s4cJ@yxU?E!2nhPR~8}oI7`>zyJLFMMQ7uwM&OCc`h{>Ilc^~?lP)-y_4pUQO)a_
zFzcE3s`vSlPk1}kQnkPEamRr3133!0PGiAn`wqcxo%TDe(_yD;skKD@01IM0My^bb
zugChvexKnz5}MILuAq20YJa`B6oKwEGuI--XwHLl6Vi+tK@@5(!=x{uwqB)R^v5am
z-&bVs%U3!!j3W#)QwMTKN?~NNxQ-^+)@Frt#;pfR@R-r!zea~#rKoVO#Ld9$dd15f
z?PLLAR~vURANE}&oQbJU7;TjpA0wqOEg6O2?EEL?+q1y*M5yD;`(23&Z@*PO<^5yB
zHSV_9v~ceCKir?%umbBAw2m$k9rHlr=1kQJ=_1T%VGyNpAWo#hpq9T0e)Wkb-@$of
zt{{&2_9hmRCA{E=+28UZLVLt$2G1;hfn~%R)v+?s$)lUcIiT}c&(H!^4SHblMS5uC
zlC942E6A_Xn#CW{`m}BXt4%8FY!&JrBmaalzo&WqHtkI7pJBC2&!^v}_ZNlyOZ1j?
LuurdSrw4xl1l{OR

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/jar/JarFile.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/jar/JarFile.class
deleted file mode 100644
index 0309fce1946bce9ee7d690849d266fa2b5c186a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 785
zcma)4%T5A85Ujz+BKYK`_>4D5)bWlnA!bQ1E*>x*yqJj@$&hu}EVD-aG!K4&A7$)W
z79tA=FWa-#Royk+^ZoPr1>hV<4)z@EGpu>dPP^rH?;bl%&t)jw^u?>-zR*41HKEeI
z29d4?dT4|;_ri~476%N=7fLI0$xyD%D(d$PIrr^J21b$6!68Fs4)4Jdw~~Y!@Rssr
z!(xRL788qUux+XNo;04&>RApA!)~oUvJ)BQ^S%iAI7ip8)N2vC+Jx^6Cvyy?#bY*!
zvn2kf@<RpuK?O0Jl#Zl^N)8#SQ|??Hy~t455fN*h>bG?e8JfBjFAO~K7vE&6Wa5$r
z_D4V^a@|1`K1n-8hE?)zPiJ<Yw5E8ilc^-hDLm;hl9xR9u6f$-wD|aeoOvyVVqC^{
zzMbqB$6(0Nv!V-P0gDuu=r4n1<ml`mOWzejY-WVyXOPtyWNijnPazxFOd(q+#6F5B
T#j%VE#baz^C&jE1p26-fX7s!?

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/java/util/logging/LogManager.class b/java/java-tests/testData/psi/repositoryUse/cls/java/util/logging/LogManager.class
deleted file mode 100644
index 749bc62bb7728ea700c9e7dadd010f64a1d760c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmaJ<$xg#C6dbcOv}G&%4!xlE(r_<ALI@<JvPhLUa5L#67+R-t90b3{fe+xL5HD_N
zSPBQn)_XIa8Na-}zq|t2!?uTY4;uoxeWjH>5E!jguLPz-vW+M_lUjyk1a>Ob#=U%$
zeqvSIZ%1LMbm(V@y1=SzwJuH6C1anD?xYT>p<+uqrSDdH>>H9g_J^bDsczx;DWI-Z
zk&ZoV3TznaM2|F_A&_THHsLI8_BDPw<Yv8k&DdTfhpqLoZMNw*t>G~BKLVz7f$0JH
zTy`ktwBH`&SSKAaGWE^ik|EhTiuA1tlU~uomcY27n5@7`UtC50sqQA0^+|SI{36SI
zX3bu0h|8}ffnsn+!NXw?P|Vf}%_uPeov1bm%w#jFr32(A{cnx}v##y#zqq-lfDNx_
zr6vW5QTBN-CV_d^O~YIaswhKXg#R#L5@Q(U1>`Y~9Pa`iCit7@^BC_1Ud11kGV`Xm
uU&b_M+&+tv<IXuw%FVIDykjp6YM=MbVX?1}p_Z`hZdmz+Ugi1-);<7tzR7g}

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/Parametrized.class b/java/java-tests/testData/psi/repositoryUse/cls/pack/Parametrized.class
deleted file mode 100644
index 4dfded0f991cf47f977bd663e006f56ee4afbcb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 344
zcmZXPPfx-?5XIk=(n>}7W8&Q#dazy<!iB_BBP0;+)3U+E(wcSa!EeRM!~-9|4`rNf
zJP_GU-t7Br-c08E=W7q(4*duXbV77P^a#O77ut>qjluPj;7`hxB6Jd6sHbY1Dzo4;
z7t&A4jPoTM?ff6~?X!L(TqLiYy~Hy%yj9ld549Q+T64WF*j7f;gVEw4+3-8ZIT!1A
znr>8PhvQ>Jh~{NwGWDq4)ZSswTi2isA5Hl<nn>vWAAl=(va35JSAwE}xck}z&6`iq
iPJo9{G!X3cMD$V^B+^1uSJ|h2c{mmCp^dY;p8o>;?@Dt3

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/pack/Variance.class b/java/java-tests/testData/psi/repositoryUse/cls/pack/Variance.class
deleted file mode 100644
index 5d3693594f6cb93608814a212b6b02f92cabd401..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 753
zcma)(%}&BV5XWar0b4;3MO04S0FCIui>*zJi6^2aH1)ic4J?+Htc66MN>3&pd;lNH
zIJ>P0A|&=OJ0Ji4c4qeT>-_@&PM~f=26pqXmxp}<Ih%((b_iq|O^<+n74;c`Qiq4^
zW;*UM;nH4!nMx<}Y2Z=8Wt=AUc*q~6dP4n&wkn1`vyeJw@i6KWs5Y8O@s0|LNx`34
z9|cC24?-GG1)}TAH1?tES`I2}3F@B5L-%RIQVtUYPHpeJGomxv4rn-N-}Xk#k1b~f
z%~Lc(uyHhFmqCCdH5U4o3os^0qw<34g1~M$mee$CciF{%dm&(Uqp9%OHJ3Xq{%q)2
zc3l7+vY7m}I|Aj!iQoV<d@=dyfG-4Dv^k6}@FaL<TW>&K(a|7}*2EKF4TbAy0d`cZ
zgMpO<k$42_1*}QbQHs*Y3q}bir{IQS6qK)}jH1$PV6OBJg1M4VM#3gk(jLwf73N1t
dT9_XLA4rXXGT1^7_osf_Mo8jSabP(@?He^+j5GiM

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Annotation2.java b/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Annotation2.java
deleted file mode 100644
index fca1dcb367e4..000000000000
--- a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Annotation2.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pack;
-
-public @interface Annotation2 {
-  float f1() default Float.NEGATIVE_INFINITY;
-  float f2() default Float.NaN;
-  float f3() default Float.POSITIVE_INFINITY;
-
-  double d1() default Double.NEGATIVE_INFINITY;
-  double d2() default Double.NaN;
-  double d3() default Double.POSITIVE_INFINITY;
-}
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/MyClass.java b/java/java-tests/testData/psi/repositoryUse/cls/src/pack/MyClass.java
deleted file mode 100644
index d116704bb548..000000000000
--- a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/MyClass.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package pack;
-
-import java.util.ArrayList;
-
-public class MyClass extends ArrayList implements Cloneable{
-  /**
-   * @deprecated
-   */
-  static final int field1 = 123;
-
-  Object[] field2;
-
-  void method1(int[] p1, Object p2) throws Exception, java.io.IOException{
-  }
-
-  Integer method2()[]{
-    return null;
-  }
-
-  MyClass(){}
-
-  static class Inner{}
-}
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Parametrized.java b/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Parametrized.java
deleted file mode 100644
index 0ac009e09851..000000000000
--- a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Parametrized.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pack;
-
-/**
- * @author dsl
- */
-public class Parametrized<T> {
-}
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Variance.java b/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Variance.java
deleted file mode 100644
index 76eaae73273e..000000000000
--- a/java/java-tests/testData/psi/repositoryUse/cls/src/pack/Variance.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pack;
-
-import java.util.List;
-
-/**
- * @author dsl
- */
-public class Variance<T> {
-  public Parametrized<? extends T> method() { return null; }
-  public <V> Parametrized<? extends V>methodWithTypeParameter() { return null; };
-  public void removeAll(Variance<?> parameter) {} ; 
-}
diff --git a/java/java-tests/testData/psi/repositoryUse/cls/sun/reflect/LangReflectAccess.class b/java/java-tests/testData/psi/repositoryUse/cls/sun/reflect/LangReflectAccess.class
deleted file mode 100644
index f72ea5c4b06b2e8bdee21dd6611e3a15635f4243..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1429
zcma)+&raJw5XQd=kU)U^p(T`-(25heU=FBiYlNVYkRqi*G*MNFOI@>sM3#+ghqkZQ
zLm!|Ig&6N*SZl4A(^xaJzxif&#{cjB{sXX&cNJ_`@RqRXi(jW>;aw8Wcl#6P*0DUt
zA6Z?`i6UEb4B~L?k93bp>Ge8VRw%AK;l`Fk+Jq&>e-ZI@!2H|i@Gmr&p+Py!lza`U
zE{mwKh;HCVaX5A3AS8S@m6%Y|lV3(7Ck+qABj1Uqp&<M|9DdT;Ir}-`tFe!a;)lbb
zePo;UOi!T#g(5UZB3AvMxUPtzr0WlQ;q;*%E~(RxroNSRrYE_pW@O?%&cMy0b-oc=
zEKj?)v=ZTS9#qS;vqH5<%3!rER+|$cbc^U2-8l$55x<rdKk$N>uv3KY^axcqxcQT=
z!~47wkI(V6iP=X<Ml7K`?Ce1vL@nQ}wX7!ytv|wX9!SgJi#H|dal(({aZh{E4yuVQ
zpr>P99R$<R6{lm5*Q?d%AJtd&!%?rlmq;YE^;tHO2#u#s)J~QOgcAQ4f#rF^9OePG
z3n)ul!6L_(I9fuL{mWR9{#DeZt)n4r6Km4Gz)NY@(UNupucY0?>qpKT{@Rkn_B}8`
B$ld?|

diff --git a/java/java-tests/testData/psi/repositoryUse/cls/sun/security/util/SecurityConstants.class b/java/java-tests/testData/psi/repositoryUse/cls/sun/security/util/SecurityConstants.class
deleted file mode 100644
index 3ded87f8db75bf10d40be78a4daa20d246d8fd41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1757
zcmZ`(*>ck`6umCch61Gpy3<10mx9^%&5_mCgJK!WP3V)y1P>UD!z2#NukpYK@KFrc
zike6TUUG8o)w!#zU%!9+1b`c`IRTF+;E4stHatdSmoggB*ddX}eKfKU$(O{=lj5B%
z%5GM?du+iG(kXgnQk2ak@253*YQb?Srmrd49;$2b%z|m@2&v<$m^FBA!Hl%FLQgyV
z!h%`B$x9l=Ar+i8cdMv@Gjb8``;<h(V08;lC>8TWME#+Mj64n@G#F`I3r;G{D4cPE
zV&_4~0~$s<ao8Hh+`yP4`=}|bZ)n!LvS7+#EXFtuPY5~DmBB=NX}jOe%I~(5=Rw;2
zl=XU9r@-MZMLb}%Nm<<Te3!Qj@xnlyd@XIK6&bqas!1VY!n~l)ozOLer^ps1FJlzN
z7~79tZPRUPoLH4Ray=0+XD1H4*OUq4z&ybdxUZ1cd1QDNs~(4;P1TYJDDgIS;w{H_
z84V4gYNtp`+fPfQofVahFh>Z+9e0mZjZt3AuwRtfr_|7|4jOLIMje%EHu@eG8r-ew
zine6qx@*O7ZH9b1Fv_0U#5)?81750Z|0{M*;8OpUX;yWK^%)t??71XD-4>(8d6|+o
z>Yl%6IJ2@q&OCyf)b8Fq<HTXH`cQPw@*rWg3DIeP+_Q{nm&cB|*K<<v%^u$4q+h<b
z9sDtBTvp1^YvSv&NzI{+Kgo)$#8+b9rOQnVCPk;;ZKoSqo?0-s+w<;Y)4N_hMHZax
z^@~y3ewpR=Uq|uX8NFNl&4;vIS}^`L&C?P?Po&>)p4Gqo-86Y?!GW*%DOQed+Uw+B
zs(<ZHQ4Cah)+^Hj<w?7pe#SUc%D292n5?3#%NTGIEEvOwbqy9_AM8hV0NEIfBcITC
z4f#QhPa;30@x#cEXnYF!QH@U{pV9a+<i|CB0{N`Q=aA29d;$5Q#;g2G8n5y%!%3`t
z5msPT;wgov6|N~fqwuW4b8udszW^5{UQ&2j;T45f6|O71rtmu0Qg=h)O@+7MwzS`Y
WyAtn7tmb_m9-zg7hxj`NkNyB>*_Xcn

diff --git a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java
index bd41a9ccc06d..da25a5af0f0e 100644
--- a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java
+++ b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/ProjectLibrariesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,93 +24,80 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable;
 import com.intellij.openapi.roots.libraries.Library;
-import com.intellij.openapi.roots.libraries.LibraryTable;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.IdeaTestCase;
 
-import java.io.File;
 import java.util.Arrays;
 
 /**
  * @author dsl
  */
 public class ProjectLibrariesTest extends IdeaTestCase {
-  public void test() {
-    final LibraryTable libraryTable = ProjectLibraryTable.getInstance(myProject);
-    Library lib = WriteCommandAction.runWriteCommandAction(null, new Computable<Library>() {
+  private VirtualFile myRoot;
+  private Library myLib;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    myRoot = LocalFileSystem.getInstance().findFileByPath(PathManagerEx.getTestDataPath() + "/psi/cls/repo");
+    assertNotNull(myRoot);
+
+    myLib = WriteCommandAction.runWriteCommandAction(null, new Computable<Library>() {
       @Override
       public Library compute() {
-        return libraryTable.createLibrary("LIB");
+        return ProjectLibraryTable.getInstance(myProject).createLibrary("LIB");
       }
     });
-    ModuleRootModificationUtil.addDependency(myModule, lib);
-    final JavaPsiFacade manager = getJavaFacade();
-    assertNull(manager.findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
-    final File file = new File(PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls");
-    final VirtualFile root = WriteCommandAction.runWriteCommandAction(null, new Computable<VirtualFile>() {
-      @Override
-      public VirtualFile compute() {
-        return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file);
-      }
-    });
-    assertNotNull(root);
-    final Library.ModifiableModel modifyableModel = lib.getModifiableModel();
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        modifyableModel.addRoot(root, OrderRootType.CLASSES);
-        modifyableModel.commit();
-      }
-    });
-    final PsiClass aClass = manager.findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule));
-    assertNotNull(aClass);
+    ModuleRootModificationUtil.addDependency(myModule, myLib);
   }
 
-  public void test1() {
-    final LibraryTable libraryTable = ProjectLibraryTable.getInstance(myProject);
-    Library lib = WriteCommandAction.runWriteCommandAction(null, new Computable<Library>() {
-      @Override
-      public Library compute() {
-        return libraryTable.createLibrary("LIB");
-      }
-    });
-    ModuleRootModificationUtil.addDependency(myModule, lib);
-    final JavaPsiFacade manager = getJavaFacade();
-    assertNull(manager.findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
+  public void test() {
+    assertNull(getJavaFacade().findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
 
-    final ModifiableRootModel rootModel2 = ModuleRootManager.getInstance(myModule).getModifiableModel();
-    assertNotNull(rootModel2.findLibraryOrderEntry(lib));
-    final File file = new File(PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls");
-    final VirtualFile root = WriteCommandAction.runWriteCommandAction(null, new Computable<VirtualFile>() {
-      @Override
-      public VirtualFile compute() {
-        return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file);
-      }
-    });
-    assertNotNull(root);
-    final Library.ModifiableModel modifyableModel = lib.getModifiableModel();
+    final Library.ModifiableModel model = myLib.getModifiableModel();
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
-        modifyableModel.addRoot(root, OrderRootType.CLASSES);
-        modifyableModel.commit();
+        model.addRoot(myRoot, OrderRootType.CLASSES);
+        model.commit();
       }
     });
-    final PsiClass aClass = manager.findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule));
-    assertNotNull(aClass);
-    assertTrue(Arrays.asList(rootModel2.orderEntries().librariesOnly().classes().getRoots()).contains(root));
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        rootModel2.commit();
-      }
-    });
-    final PsiClass aClass1 = manager.findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule));
-    assertNotNull(aClass1);
+
+    assertNotNull(getJavaFacade().findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
+  }
+
+  public void testNestedModelUpdate() {
+    assertNull(getJavaFacade().findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
+
+    final ModifiableRootModel moduleModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+    try {
+      assertNotNull(moduleModel.findLibraryOrderEntry(myLib));
+
+      final Library.ModifiableModel libModel = myLib.getModifiableModel();
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        @Override
+        public void run() {
+          libModel.addRoot(myRoot, OrderRootType.CLASSES);
+          libModel.commit();
+        }
+      });
+
+      assertNotNull(getJavaFacade().findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
+      assertTrue(Arrays.asList(moduleModel.orderEntries().librariesOnly().classes().getRoots()).contains(myRoot));
+    }
+    finally {
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        @Override
+        public void run() {
+          moduleModel.commit();
+        }
+      });
+    }
+
+    assertNotNull(getJavaFacade().findClass("pack.MyClass", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule)));
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
index 8cfaeb0646ae..9d152d5be989 100644
--- a/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
@@ -47,7 +47,7 @@ public class ClsBuilderTest extends LightIdeaTestCase {
   public void testAnnotatedEnumConstructor() { doTest(); }
 
   public void testModifiers() {
-    String clsFilePath = JavaTestUtil.getJavaTestDataPath() + "/psi/repositoryUse/cls/pack/" + getTestName(false) + ".class";
+    String clsFilePath = JavaTestUtil.getJavaTestDataPath() + "/psi/cls/repo/pack/" + getTestName(false) + ".class";
     VirtualFile clsFile = LocalFileSystem.getInstance().findFileByPath(clsFilePath);
     assertNotNull(clsFile);
     doTest(clsFile, getTestName(false) + ".txt");
diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsPsiTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsPsiTest.java
index 2cd4c2c4bd61..be1299c5ca1f 100644
--- a/java/java-tests/testSrc/com/intellij/psi/ClsPsiTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/ClsPsiTest.java
@@ -16,24 +16,361 @@
 package com.intellij.psi;
 
 import com.intellij.openapi.application.ex.PathManagerEx;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.io.IoTestUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.impl.compiled.ClsFileImpl;
+import com.intellij.psi.impl.compiled.ClsParameterImpl;
+import com.intellij.psi.impl.java.stubs.PsiMethodStub;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.testFramework.LightIdeaTestCase;
+import com.intellij.util.indexing.FileBasedIndex;
+
+import java.io.File;
+import java.io.IOException;
 
 public class ClsPsiTest extends LightIdeaTestCase {
+  private static final String TEST_DATA_PATH = "/psi/cls/repo";
+
+  private PsiClass myObjectClass;
+  private GlobalSearchScope myScope;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    myScope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(getModule());
+    myObjectClass = getJavaFacade().findClass(CommonClassNames.JAVA_LANG_OBJECT, myScope);
+    assertNotNull(myObjectClass);
+  }
+
+  public void testClassFileUpdate() throws IOException {
+    File testFile = IoTestUtil.createTestFile("TestClass.class");
+    File file1 = new File(PathManagerEx.getTestDataPath() + TEST_DATA_PATH + "/1_TestClass.class");
+    FileUtil.copy(file1, testFile);
+    VirtualFile vFile = LocalFileSystem.getInstance().findFileByIoFile(testFile);
+    assertNotNull(testFile.getPath(), vFile);
+    FileBasedIndex.getInstance().requestReindex(vFile);
+    PsiFile file = PsiManager.getInstance(getProject()).findFile(vFile);
+    assertNotNull(file);
+
+    PsiClass aClass = ((PsiJavaFile)file).getClasses()[0];
+    assertTrue(aClass.isValid());
+    assertEquals(2, aClass.getFields().length);
+    assertEquals("field11", aClass.getFields()[0].getName());
+    assertEquals("field12", aClass.getFields()[1].getName());
+    assertEquals(2, aClass.getMethods().length);
+    assertEquals("TestClass", aClass.getMethods()[0].getName());
+    assertEquals("method1", aClass.getMethods()[1].getName());
+
+    File file2 = new File(PathManagerEx.getTestDataPath() + TEST_DATA_PATH + "/2_TestClass.class");
+    FileUtil.copy(file2, testFile);
+    assertTrue(testFile.setLastModified(System.currentTimeMillis() + 5000));
+    vFile.refresh(false, false);
+
+    aClass = ((PsiJavaFile)file).getClasses()[0];
+    assertTrue(aClass.isValid());
+    assertTrue(aClass.isValid());
+    assertEquals(1, aClass.getFields().length);
+    assertEquals("field2", aClass.getFields()[0].getName());
+    assertEquals(2, aClass.getMethods().length);
+    assertEquals("TestClass", aClass.getMethods()[0].getName());
+    assertEquals("method2", aClass.getMethods()[1].getName());
+  }
+
+  public void testFile() {
+    PsiJavaFile file = getFile("MyClass");
+    assertTrue(file.isValid());
+    assertEquals("pack", file.getPackageName());
+    assertEquals(1, file.getClasses().length);
+  }
+
+  public void testClassBasics() {
+    PsiJavaFile file = getFile("MyClass");
+    PsiClass aClass = file.getClasses()[0];
+    assertTrue(aClass.isValid());
+
+    assertEquals(file, aClass.getParent());
+    assertEquals(file, aClass.getContainingFile());
+    assertEquals("MyClass", aClass.getName());
+    assertEquals("pack.MyClass", aClass.getQualifiedName());
+    assertFalse(aClass.isInterface());
+    assertFalse(aClass.isDeprecated());
+  }
+
+  public void testClassMembers() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+
+    PsiClass[] inners = aClass.getInnerClasses();
+    assertEquals(1, inners.length);
+    assertEquals(aClass, inners[0].getParent());
+
+    PsiField[] fields = aClass.getFields();
+    assertEquals(2, fields.length);
+    assertEquals(aClass, fields[0].getParent());
+
+    PsiMethod[] methods = aClass.getMethods();
+    assertEquals(3, methods.length);
+    assertEquals(aClass, methods[0].getParent());
+
+    assertNotNull(aClass.findFieldByName("field1", false));
+  }
+
+  public void testModifierList() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+
+    PsiModifierList modifierList = aClass.getModifierList();
+    assertNotNull(modifierList);
+    assertTrue(modifierList.hasModifierProperty(PsiModifier.PUBLIC));
+    assertFalse(modifierList.hasModifierProperty(PsiModifier.STATIC));
+    assertEquals(modifierList.getParent(), aClass);
+
+    PsiField field = aClass.getFields()[0];
+    modifierList = field.getModifierList();
+    assertNotNull(modifierList);
+    assertTrue(modifierList.hasModifierProperty(PsiModifier.PACKAGE_LOCAL));
+    assertEquals(modifierList.getParent(), field);
+
+    PsiMethod method = aClass.getMethods()[0];
+    modifierList = method.getModifierList();
+    assertNotNull(modifierList);
+    assertTrue(modifierList.hasModifierProperty(PsiModifier.PACKAGE_LOCAL));
+    assertEquals(modifierList.getParent(), method);
+  }
+
+  public void testField() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+    PsiField field1 = aClass.getFields()[0], field2 = aClass.getFields()[1];
+
+    assertEquals("field1", field1.getName());
+
+    PsiType type1 = field1.getType();
+    assertEquals(PsiType.INT, type1);
+    assertEquals("int", type1.getPresentableText());
+    assertTrue(type1 instanceof PsiPrimitiveType);
+
+    PsiType type2 = field2.getType();
+    assertTrue(type2.equalsToText("java.lang.Object[]"));
+    assertEquals("Object[]", type2.getPresentableText());
+    assertFalse(type2 instanceof PsiPrimitiveType);
+    assertTrue(type2 instanceof PsiArrayType);
+
+    PsiType componentType = ((PsiArrayType)type2).getComponentType();
+    assertTrue(componentType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
+    assertEquals(CommonClassNames.JAVA_LANG_OBJECT_SHORT, componentType.getPresentableText());
+    assertFalse(componentType instanceof PsiPrimitiveType);
+    assertFalse(componentType instanceof PsiArrayType);
+
+    PsiLiteralExpression initializer = (PsiLiteralExpression)field1.getInitializer();
+    assertNotNull(initializer);
+    assertEquals("123", initializer.getText());
+    assertEquals(123, initializer.getValue());
+    assertEquals(PsiType.INT, initializer.getType());
+
+    assertFalse(field2.hasInitializer());
+    assertNull(field2.getInitializer());
+  }
+
+  public void testMethod() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+
+    assertEquals("method1", aClass.getMethods()[0].getName());
+
+    PsiMethod method1 = aClass.getMethods()[0];
+    PsiTypeElement type1 = method1.getReturnTypeElement();
+    assertNotNull(type1);
+    assertEquals(method1, type1.getParent());
+    assertEquals("void", type1.getText());
+    assertTrue(type1.getType() instanceof PsiPrimitiveType);
+    assertFalse(method1.isConstructor());
+
+    PsiMethod method3 = aClass.getMethods()[2];
+    assertNull(method3.getReturnType());
+    assertTrue(method3.isConstructor());
+  }
+
+  public void testTypeReference() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+
+    PsiType type1 = aClass.getFields()[0].getType();
+    assertNull(PsiUtil.resolveClassInType(type1));
+
+    PsiType type2 = aClass.getFields()[1].getType();
+    PsiType componentType = ((PsiArrayType)type2).getComponentType();
+    assertTrue(componentType instanceof PsiClassType);
+    assertTrue(componentType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
+    assertEquals(CommonClassNames.JAVA_LANG_OBJECT_SHORT, componentType.getPresentableText());
+
+    PsiElement target = PsiUtil.resolveClassInType(type2);
+    assertEquals(myObjectClass, target);
+  }
+
+  public void testReferenceLists() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+
+    PsiReferenceList extList = aClass.getExtendsList();
+    assertNotNull(extList);
+    PsiClassType[] refs = extList.getReferencedTypes();
+    assertEquals(1, refs.length);
+    assertEquals("ArrayList", refs[0].getPresentableText());
+    assertEquals("java.util.ArrayList", refs[0].getCanonicalText());
+
+    PsiReferenceList implList = aClass.getImplementsList();
+    assertNotNull(implList);
+    PsiClassType[] implRefs = implList.getReferencedTypes();
+    assertEquals(1, implRefs.length);
+    assertEquals("Cloneable", implRefs[0].getPresentableText());
+    assertEquals("java.lang.Cloneable", implRefs[0].getCanonicalText());
+
+    PsiReferenceList throwsList = aClass.getMethods()[0].getThrowsList();
+    PsiClassType[] throwsRefs = throwsList.getReferencedTypes();
+    assertEquals(2, throwsRefs.length);
+    assertEquals("Exception", throwsRefs[0].getPresentableText());
+    assertEquals("java.lang.Exception", throwsRefs[0].getCanonicalText());
+    assertEquals("IOException", throwsRefs[1].getPresentableText());
+    assertEquals("java.io.IOException", throwsRefs[1].getCanonicalText());
+  }
+
+  public void testParameters() {
+    PsiClass aClass = getFile("MyClass").getClasses()[0];
+
+    PsiParameter[] parameters = aClass.getMethods()[0].getParameterList().getParameters();
+    assertEquals(2, parameters.length);
+
+    PsiType type1 = parameters[0].getType();
+    assertEquals("int[]", type1.getPresentableText());
+    assertTrue(type1.equalsToText("int[]"));
+    assertTrue(type1 instanceof PsiArrayType);
+    assertNull(PsiUtil.resolveClassInType(type1));
+
+    PsiType type2 = parameters[1].getType();
+    assertEquals("Object", type2.getPresentableText());
+    assertTrue(type2.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
+    assertFalse(type2 instanceof PsiArrayType);
+    assertFalse(type2 instanceof PsiPrimitiveType);
+    PsiClass target2 = PsiUtil.resolveClassInType(type2);
+    assertEquals(myObjectClass, target2);
+
+    assertNotNull(parameters[0].getModifierList());
+    assertNotNull(parameters[1].getModifierList());
+
+    assertTrue(((ClsParameterImpl)parameters[0]).isAutoGeneratedName());
+    assertTrue(((ClsParameterImpl)parameters[1]).isAutoGeneratedName());
+    assertEquals("ints", parameters[0].getName());
+    assertEquals("o", parameters[1].getName());
+  }
+
+  @SuppressWarnings("ConstantConditions")
+  public void testModifiers() {
+    PsiClass aClass = getFile().getClasses()[0];
+    assertEquals("private transient", aClass.getFields()[0].getModifierList().getText());
+    assertEquals("private volatile", aClass.getFields()[1].getModifierList().getText());
+    assertEquals("public", aClass.getMethods()[0].getModifierList().getText());
+    assertEquals("private", aClass.getMethods()[1].getModifierList().getText());
+    assertEquals("private synchronized", aClass.getMethods()[2].getModifierList().getText());
+  }
+
+  public void testEnum() {
+    PsiClass aClass = getFile("MyEnum").getClasses()[0];
+    assertTrue(aClass.isEnum());
+    PsiField[] fields = aClass.getFields();
+    PsiClassType type = getJavaFacade().getElementFactory().createType(aClass);
+    assertEnumConstant(fields[0], "RED", type);
+    assertEnumConstant(fields[1], "GREEN", type);
+    assertEnumConstant(fields[2], "BLUE", type);
+  }
+
+  private static void assertEnumConstant(PsiField field, String name, PsiClassType type) {
+    assertEquals(name, field.getName());
+    assertTrue(field instanceof PsiEnumConstant);
+    assertEquals(type, field.getType());
+  }
+
+  public void testAnnotations() {
+    PsiClass aClass = getFile("Annotated").getClasses()[0];
+
+    PsiModifierList modifierList = aClass.getModifierList();
+    assertNotNull(modifierList);
+    PsiAnnotation[] annotations = modifierList.getAnnotations();
+    assertEquals(1, annotations.length);
+    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
+
+    PsiMethod method = aClass.getMethods()[1];
+    annotations = method.getModifierList().getAnnotations();
+    assertEquals(1, annotations.length);
+    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
+
+    PsiParameter[] params = method.getParameterList().getParameters();
+    assertEquals(1, params.length);
+    modifierList = params[0].getModifierList();
+    assertNotNull(modifierList);
+    annotations = modifierList.getAnnotations();
+    assertEquals(1, annotations.length);
+    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
+
+    modifierList = aClass.getFields()[0].getModifierList();
+    assertNotNull(modifierList);
+    annotations = modifierList.getAnnotations();
+    assertEquals(1, annotations.length);
+    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
+  }
+
+  public void testAnnotationMethods() {
+    PsiMethod[] methods = getFile("Annotation").getClasses()[0].getMethods();
+    assertNotNull(((PsiAnnotationMethod)methods[0]).getDefaultValue());
+
+    methods = getFile("Annotation2").getClasses()[0].getMethods();
+    for (PsiMethod method : methods) {
+      assertTrue(String.valueOf(method), method instanceof PsiAnnotationMethod);
+      try {
+        PsiAnnotationMemberValue defaultValue = ((PsiAnnotationMethod)method).getDefaultValue();
+        assertTrue(String.valueOf(defaultValue), defaultValue instanceof PsiBinaryExpression);
+        PsiPrimitiveType type = method.getName().startsWith("f") ? PsiType.FLOAT : PsiType.DOUBLE;
+        assertEquals(type, ((PsiBinaryExpression)defaultValue).getType());
+      }
+      catch (Exception e) {
+        String valueText = ((PsiMethodStub)((StubBasedPsiElement)method).getStub()).getDefaultValueText();
+        fail("Unable to compute default value of method " + method + " from text '" + valueText + "': " + e.getMessage());
+      }
+    }
+  }
+
   public void testKeywordAnnotatedClass() {
-    PsiModifierList modList = getFile().getClasses()[0].getModifierList();
+    PsiModifierList modList = getFile("../KeywordAnnotatedClass").getClasses()[0].getModifierList();
     assertNotNull(modList);
     assertEquals("@pkg.native", modList.getAnnotations()[0].getText());
   }
 
+  public void testGenerics() {
+    PsiClass aClass = getJavaFacade().findClass(CommonClassNames.JAVA_UTIL_HASH_MAP, myScope);
+    assertNotNull(aClass);
+
+    PsiTypeParameter[] parameters = aClass.getTypeParameters();
+    assertEquals(2, parameters.length);
+    assertEquals("K", parameters[0].getName());
+    assertEquals("V", parameters[1].getName());
+
+    PsiClassType extType = aClass.getExtendsListTypes()[0];
+    assertEquals("java.util.AbstractMap<K,V>", extType.getCanonicalText());
+
+    PsiType returnType = aClass.findMethodsByName("entrySet", false)[0].getReturnType();
+    assertNotNull(returnType);
+    assertEquals("java.util.Set<java.util.Map.Entry<K,V>>", returnType.getCanonicalText());
+
+    PsiType paramType = aClass.findMethodsByName("putAll", false)[0].getParameterList().getParameters()[0].getType();
+    assertNotNull(paramType);
+    assertEquals("java.util.Map<? extends K,? extends V>", paramType.getCanonicalText());
+    assertNotNull(((PsiClassType)paramType).resolveGenerics().getElement());
+  }
+
   private PsiJavaFile getFile() {
     return getFile(getTestName(false));
   }
 
   private static PsiJavaFile getFile(String name) {
-    String path = PathManagerEx.getTestDataPath() + "/psi/cls/tree/" + name + ".class";
+    String path = PathManagerEx.getTestDataPath() + TEST_DATA_PATH + "/pack/" + name + ".class";
     VirtualFile file = LocalFileSystem.getInstance().findFileByPath(path);
     assertNotNull(path, file);
     PsiFile clsFile = PsiManager.getInstance(getProject()).findFile(file);
diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
deleted file mode 100644
index e2cf0b9e7693..000000000000
--- a/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.psi;
-
-import com.intellij.ide.highlighter.JavaFileType;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.PathManagerEx;
-import com.intellij.openapi.roots.ModuleRootModificationUtil;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileFilter;
-import com.intellij.psi.impl.compiled.ClsParameterImpl;
-import com.intellij.psi.impl.java.stubs.PsiMethodStub;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.util.PsiUtil;
-import com.intellij.testFramework.IdeaTestUtil;
-import com.intellij.testFramework.PlatformTestCase;
-import com.intellij.testFramework.PsiTestCase;
-import com.intellij.testFramework.PsiTestUtil;
-
-import java.io.File;
-import java.io.IOException;
-
-@PlatformTestCase.WrapInCommand
-public class ClsRepositoryUseTest extends PsiTestCase {
-  private static final String TEST_ROOT = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls";
-
-  private GlobalSearchScope RESOLVE_SCOPE;
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-
-    ApplicationManager.getApplication().runWriteAction(
-      new Runnable() {
-        @Override
-        public void run() {
-          VirtualFile vDir = getRootFile();
-          PsiTestUtil.removeAllRoots(myModule, IdeaTestUtil.getMockJdk17());
-          addLibraryToRoots(vDir, OrderRootType.CLASSES);
-        }
-      }
-    );
-
-    RESOLVE_SCOPE = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule);
-  }
-
-  @Override
-  protected void tearDown() throws Exception {
-    RESOLVE_SCOPE = null;
-    super.tearDown();
-  }
-
-  public void testClassFileUpdate() throws IOException {
-    final File classes = createTempDir("classes", false);
-
-    final File com = new File(classes, "com");
-    FileUtil.ensureExists(com);
-
-    File dataPath = new File(PathManagerEx.getTestDataPath() + "/psi/cls");
-
-    final File target = new File(com, "TestClass.class");
-    FileUtil.copy(new File(dataPath, "1/TestClass.class"), target);
-    assertTrue(target.setLastModified(System.currentTimeMillis()));
-
-    ApplicationManager.getApplication().runWriteAction(
-      new Runnable() {
-        @Override
-        public void run() {
-          VirtualFile vDir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(classes);
-          assertNotNull(vDir);
-          addLibraryToRoots(vDir, OrderRootType.CLASSES);
-        }
-      }
-    );
-
-    PsiClass psiClass = myJavaFacade.findClass("com.TestClass", GlobalSearchScope.allScope(myProject));
-    assert psiClass != null;
-    PsiJavaFile psiFile = (PsiJavaFile)psiClass.getContainingFile();
-    final VirtualFile vFile = psiFile.getVirtualFile();
-
-    assertNotNull(psiClass);
-    assertTrue(psiClass.isValid());
-    assertTrue(psiFile.isValid());
-
-    assertEquals(1, psiFile.getClasses().length);
-    assertSame(psiClass, psiFile.getClasses()[0]);
-
-    assertEquals(2, psiClass.getFields().length);
-    assertEquals("field11", psiClass.getFields()[0].getName());
-    assertEquals("field12", psiClass.getFields()[1].getName());
-
-    assertEquals(2, psiClass.getMethods().length);
-    assertEquals("TestClass", psiClass.getMethods()[0].getName());
-    assertEquals("method1", psiClass.getMethods()[1].getName());
-
-    FileUtil.copy(new File(dataPath, "2/TestClass.class"), target);
-    assertTrue(target.setLastModified(System.currentTimeMillis() + 5000));
-
-    assert vFile != null;
-    ApplicationManager.getApplication().runWriteAction(
-      new Runnable() {
-        @Override
-        public void run() {
-          vFile.refresh(false, false);
-        }
-      }
-    );
-
-    assertTrue(psiFile.isValid());
-    PsiClass oldClass = psiClass;
-    psiClass = myJavaFacade.findClass("com.TestClass", GlobalSearchScope.allScope(myProject));
-    assertNotSame(oldClass, psiClass);
-    assertFalse(oldClass.isValid());
-
-    assertNotNull(psiClass);
-    assertEquals(1, psiFile.getClasses().length);
-    assertSame(psiClass, psiFile.getClasses()[0]);
-
-    assertTrue(psiClass.isValid());
-    assertEquals(1, psiClass.getFields().length);
-    assertEquals("field2", psiClass.getFields()[0].getName());
-
-    assertEquals(2, psiClass.getMethods().length);
-    assertEquals("TestClass", psiClass.getMethods()[0].getName());
-    assertEquals("method2", psiClass.getMethods()[1].getName());
-  }
-
-  private static VirtualFile getRootFile() {
-    final String path = TEST_ROOT.replace(File.separatorChar, '/');
-    final VirtualFile vDir = LocalFileSystem.getInstance().findFileByPath(path);
-    assert vDir != null : path;
-    return vDir;
-  }
-
-  public void testGetClasses() {
-    final VirtualFile rootFile = getRootFile();
-    final VirtualFile pack = rootFile.findChild("pack");
-    assert pack != null;
-    VirtualFile child = pack.findChild("MyClass.class");
-    assertNotNull(child);
-    PsiJavaFile file = (PsiJavaFile)myPsiManager.findFile(child);
-    checkValid(file);
-    assert file != null;
-    PsiClass[] classes = file.getClasses();
-    assertTrue(classes.length == 1);
-    PsiClass aClass = classes[0];
-    checkValid(aClass);
-    assertEquals(file, aClass.getParent());
-  }
-
-  public void testGetClassName() {
-    final VirtualFile rootFile = getRootFile();
-    final VirtualFile pack = rootFile.findChild("pack");
-    assert pack != null;
-    VirtualFile child = pack.findChild("MyClass.class");
-    assertNotNull(child);
-    PsiJavaFile file = (PsiJavaFile)myPsiManager.findFile(child);
-    assert file != null;
-    PsiClass[] classes = file.getClasses();
-    assertTrue(classes.length == 1);
-
-    PsiClass aClass = classes[0];
-    checkValid(aClass);
-    assertEquals("MyClass", aClass.getName());
-  }
-
-  public void testGetClassQName() {
-    final VirtualFile rootFile = getRootFile();
-    final VirtualFile pack = rootFile.findChild("pack");
-    assert pack != null;
-    VirtualFile child = pack.findChild("MyClass.class");
-    assertNotNull(child);
-    PsiJavaFile file = (PsiJavaFile)myPsiManager.findFile(child);
-    assert file != null;
-    PsiClass[] classes = file.getClasses();
-    assertTrue(classes.length == 1);
-
-    PsiClass aClass = classes[0];
-    checkValid(aClass);
-    assertEquals("pack.MyClass", aClass.getQualifiedName());
-  }
-
-  public void testGetContainingFile() {
-    final VirtualFile rootFile = getRootFile();
-    final VirtualFile pack = rootFile.findChild("pack");
-    assert pack != null;
-    VirtualFile child = pack.findChild("MyClass.class");
-    assertNotNull(child);
-    PsiJavaFile file = (PsiJavaFile)myPsiManager.findFile(child);
-    assert file != null;
-    PsiClass[] classes = file.getClasses();
-    assertTrue(classes.length == 1);
-
-    PsiClass aClass = classes[0];
-    checkValid(aClass);
-    assertEquals(file, aClass.getContainingFile());
-  }
-
-  public void testFindClass() {
-    getJavaFacade().setAssertOnFileLoadingFilter(VirtualFileFilter.ALL, myTestRootDisposable);
-
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assertNotNull(aClass);
-    checkValid(aClass);
-  }
-
-  public void testIsInterface() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    assertTrue(!aClass.isInterface());
-  }
-
-  private static void checkValid(final PsiElement elt) {
-    assertTrue(elt.isValid());
-  }
-
-  public void testPackageName() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    String packageName = ((PsiJavaFile)aClass.getContainingFile()).getPackageName();
-    assertEquals("pack", packageName);
-  }
-
-  public void testGetFields() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    PsiField[] fields = aClass.getFields();
-    assertEquals(2, fields.length);
-    assertEquals(aClass, fields[0].getParent());
-  }
-
-  public void testGetMethods() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    PsiMethod[] methods = aClass.getMethods();
-    assertEquals(3, methods.length);
-    assertEquals(aClass, methods[0].getParent());
-  }
-
-  public void testGetInnerClasses() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    PsiClass[] inners = aClass.getInnerClasses();
-    assertEquals(1, inners.length);
-    assertEquals(aClass, inners[0].getParent());
-  }
-
-  public void testModifierList() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiModifierList modifierList = aClass.getModifierList();
-    assert modifierList != null : aClass;
-    assertTrue(modifierList.hasModifierProperty(PsiModifier.PUBLIC));
-    assertFalse(modifierList.hasModifierProperty(PsiModifier.STATIC));
-    assertEquals(modifierList.getParent(), aClass);
-
-    PsiField field = aClass.getFields()[0];
-    modifierList = field.getModifierList();
-    assert modifierList != null : field;
-    assertTrue(modifierList.hasModifierProperty(PsiModifier.PACKAGE_LOCAL));
-    assertEquals(modifierList.getParent(), field);
-
-    PsiMethod method = aClass.getMethods()[0];
-    modifierList = method.getModifierList();
-    assertTrue(modifierList.hasModifierProperty(PsiModifier.PACKAGE_LOCAL));
-    assertEquals(modifierList.getParent(), method);
-  }
-
-  public void testGetFieldName() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    assertEquals("field1", aClass.getFields()[0].getName());
-  }
-
-  public void testGetMethodName() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    assertEquals("method1", aClass.getMethods()[0].getName());
-  }
-
-  public void testFindFieldByName() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    PsiField field = aClass.findFieldByName("field1", false);
-    assertNotNull(field);
-  }
-
-  public void testIsDeprecated() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-    assertTrue(!aClass.isDeprecated());
-
-    PsiField field = aClass.findFieldByName("field1", false);
-    assert field != null : aClass;
-    assertTrue(field.isDeprecated());
-  }
-
-  public void testFieldType() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiField field1 = aClass.getFields()[0];
-    PsiType type1 = field1.getType();
-
-    PsiField field2 = aClass.getFields()[1];
-    PsiType type2 = field2.getType();
-
-    assertEquals(PsiType.INT, type1);
-    assertTrue(type2.equalsToText("java.lang.Object[]"));
-
-    assertEquals("int", type1.getPresentableText());
-    assertEquals("Object[]", type2.getPresentableText());
-
-    assertTrue(type1 instanceof PsiPrimitiveType);
-    assertTrue(!(type2 instanceof PsiPrimitiveType));
-    assertTrue(type2 instanceof PsiArrayType);
-  }
-
-  public void testMethodType() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiMethod method1 = aClass.getMethods()[0];
-    PsiTypeElement type1 = method1.getReturnTypeElement();
-    assert type1 != null : method1;
-    assertEquals(method1, type1.getParent());
-
-    assertEquals("void", type1.getText());
-    assertTrue(type1.getType() instanceof PsiPrimitiveType);
-
-    PsiMethod method3 = aClass.getMethods()[2];
-    assertNull(method3.getReturnType());
-  }
-
-  public void testIsConstructor() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiMethod method1 = aClass.getMethods()[0];
-    assertFalse(method1.isConstructor());
-
-    PsiMethod method3 = aClass.getMethods()[2];
-    assertTrue(method3.isConstructor());
-  }
-
-  public void testComponentType() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiField field = aClass.getFields()[1];
-    PsiType type = field.getType();
-    assertTrue(type instanceof PsiArrayType);
-    PsiType componentType = ((PsiArrayType)type).getComponentType();
-
-    assertTrue(componentType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
-    assertEquals("Object", componentType.getPresentableText());
-    assertFalse(componentType instanceof PsiPrimitiveType);
-    assertFalse(componentType instanceof PsiArrayType);
-  }
-
-  public void testTypeReference() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiField field1 = aClass.getFields()[0];
-    PsiType type1 = field1.getType();
-    assertNull(PsiUtil.resolveClassInType(type1));
-
-    PsiField field2 = aClass.getFields()[1];
-    PsiType type2 = ((PsiArrayType)field2.getType()).getComponentType();
-    assertTrue(type2 instanceof PsiClassType);
-
-    assertTrue(type2.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
-    assertEquals("Object", type2.getPresentableText());
-  }
-
-  public void testResolveTypeReference() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiType type1 = aClass.getFields()[1].getType();
-    PsiElement target1 = PsiUtil.resolveClassInType(type1);
-    assertNotNull(target1);
-    PsiClass objectClass = myJavaFacade.findClasses(CommonClassNames.JAVA_LANG_OBJECT, RESOLVE_SCOPE)[1];
-    assertEquals(objectClass, target1);
-  }
-
-  public void testInitializer() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiField field1 = aClass.getFields()[0];
-    assertTrue(field1.hasInitializer());
-    PsiLiteralExpression initializer = (PsiLiteralExpression)field1.getInitializer();
-    assert initializer != null : field1;
-    assertEquals("123", initializer.getText());
-    assertEquals(new Integer(123), initializer.getValue());
-    assertEquals(PsiType.INT, initializer.getType());
-
-    PsiField field2 = aClass.getFields()[1];
-    assertFalse(field2.hasInitializer());
-    assertNull(field2.getInitializer());
-  }
-
-  public void testExtendsList() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiReferenceList list = aClass.getExtendsList();
-    assert list != null : aClass;
-    PsiClassType[] refs = list.getReferencedTypes();
-    assertEquals(1, refs.length);
-    assertEquals("ArrayList", refs[0].getPresentableText());
-    assertEquals("java.util.ArrayList", refs[0].getCanonicalText());
-  }
-
-  public void testImplementsList() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiReferenceList list = aClass.getImplementsList();
-    assert list != null : aClass;
-    PsiClassType[] refs = list.getReferencedTypes();
-    assertEquals(1, refs.length);
-    assertEquals("Cloneable", refs[0].getPresentableText());
-    assertEquals("java.lang.Cloneable", refs[0].getCanonicalText());
-  }
-
-  public void testThrowsList() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiReferenceList list = aClass.getMethods()[0].getThrowsList();
-
-    PsiClassType[] refs = list.getReferencedTypes();
-    assertEquals(2, refs.length);
-    assertEquals("Exception", refs[0].getPresentableText());
-    assertEquals("IOException", refs[1].getPresentableText());
-    assertEquals("java.lang.Exception", refs[0].getCanonicalText());
-    assertEquals("java.io.IOException", refs[1].getCanonicalText());
-  }
-
-  public void testParameters() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyClass", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiParameterList list = aClass.getMethods()[0].getParameterList();
-
-    PsiParameter[] parameters = list.getParameters();
-    assertEquals(2, parameters.length);
-
-    PsiType type1 = parameters[0].getType();
-    assertEquals("int[]", type1.getPresentableText());
-    assertTrue(type1.equalsToText("int[]"));
-    assertTrue(type1 instanceof PsiArrayType);
-    assertNull(PsiUtil.resolveClassInType(type1));
-
-    PsiType type2 = parameters[1].getType();
-    assertEquals("Object", type2.getPresentableText());
-    assertTrue(type2.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
-    assertFalse(type2 instanceof PsiArrayType);
-    assertFalse(type2 instanceof PsiPrimitiveType);
-    PsiClass target2 = PsiUtil.resolveClassInType(type2);
-    assertNotNull(target2);
-    PsiClass objectClass = myJavaFacade.findClasses(CommonClassNames.JAVA_LANG_OBJECT, RESOLVE_SCOPE)[1];
-    assertEquals(objectClass, target2);
-
-    assertNotNull(parameters[0].getModifierList());
-    assertNotNull(parameters[1].getModifierList());
-
-    assertTrue(((ClsParameterImpl)parameters[0]).isAutoGeneratedName());
-    assertTrue(((ClsParameterImpl)parameters[1]).isAutoGeneratedName());
-    assertEquals("ints", parameters[0].getName());
-    assertEquals("o", parameters[1].getName());
-  }
-
-  public void testGenericClass() {
-    disableJdk();
-
-    PsiClass map = myJavaFacade.findClass("java.util.HashMap", RESOLVE_SCOPE);
-    assert map != null;
-    PsiMethod entrySet = map.findMethodsByName("entrySet", false)[0];
-    PsiClassType ret = (PsiClassType)entrySet.getReturnType();
-    assert ret != null : entrySet;
-    final PsiClassType.ClassResolveResult setResolveResult = ret.resolveGenerics();
-    final PsiClass setResolveResultElement = setResolveResult.getElement();
-    assert setResolveResultElement != null : setResolveResult;
-    assertEquals(CommonClassNames.JAVA_UTIL_SET, setResolveResultElement.getQualifiedName());
-    final PsiTypeParameter typeParameter = setResolveResultElement.getTypeParameters()[0];
-
-    final PsiType substitutedResult = setResolveResult.getSubstitutor().substitute(typeParameter);
-    assertTrue(substitutedResult instanceof PsiWildcardType);
-    assertTrue(((PsiWildcardType)substitutedResult).isExtends());
-    PsiClassType setType = (PsiClassType)((PsiWildcardType)substitutedResult).getBound();
-    assert setType != null;
-    final PsiClassType.ClassResolveResult setTypeResolveResult = setType.resolveGenerics();
-    final PsiClass setTypeResolveResultElement = setTypeResolveResult.getElement();
-    assert setTypeResolveResultElement != null : setTypeResolveResult;
-    assertEquals("java.util.Map.Entry", setTypeResolveResultElement.getQualifiedName());
-    final PsiTypeParameter[] typeParameters = setTypeResolveResultElement.getTypeParameters();
-    assertEquals(2, typeParameters.length);
-    PsiType[] mapParams = {
-      setTypeResolveResult.getSubstitutor().substitute(typeParameters[0]),
-      setTypeResolveResult.getSubstitutor().substitute(typeParameters[1])
-    };
-    assertEquals(2, mapParams.length);
-    assertEquals("K", mapParams[0].getCanonicalText());
-    assertTrue(((PsiClassType)mapParams[0]).resolve() instanceof PsiTypeParameter);
-    assertEquals("V", mapParams[1].getCanonicalText());
-    assertTrue(((PsiClassType)mapParams[1]).resolve() instanceof PsiTypeParameter);
-  }
-
-  private void disableJdk() {
-    ModuleRootModificationUtil.setModuleSdk(myModule, null);
-  }
-
-  public void testGenericReturnType() {
-    disableJdk();
-
-    final PsiClass map = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, RESOLVE_SCOPE);
-    assert map != null;
-    final PsiElementFactory factory = myJavaFacade.getElementFactory();
-    final PsiClassType typeMapStringToInteger =
-      (PsiClassType)factory.createTypeFromText("java.util.Map <java.lang.String,java.lang.Integer>", null);
-    final PsiClassType.ClassResolveResult mapResolveResult = typeMapStringToInteger.resolveGenerics();
-    final PsiClass mapResolveResultElement = mapResolveResult.getElement();
-    assert mapResolveResultElement != null : typeMapStringToInteger;
-    assertTrue(mapResolveResultElement.equals(map));
-
-    final PsiMethod entrySetMethod = map.findMethodsByName("entrySet", false)[0];
-    final PsiType entrySetReturnType = entrySetMethod.getReturnType();
-    assert entrySetReturnType != null : entrySetMethod;
-    assertEquals("java.util.Set<? extends java.util.Map.Entry<K,V>>", entrySetReturnType.getCanonicalText());
-    final PsiSubstitutor substitutor = ((PsiClassType)entrySetReturnType).resolveGenerics().getSubstitutor();
-    assertEquals("E of java.util.Set -> ? extends java.util.Map.Entry<K,V>\n", substitutor.toString());
-    final PsiType typeSetOfEntriesOfStringAndInteger =
-      factory.createTypeFromText("java.util.Set<? extends java.util.Map.Entry<java.lang.String,java.lang.Integer>>", null);
-    final PsiType substitutedEntrySetReturnType = mapResolveResult.getSubstitutor().substitute(entrySetReturnType);
-    assertTrue(typeSetOfEntriesOfStringAndInteger.equals(substitutedEntrySetReturnType));
-    assertTrue(typeSetOfEntriesOfStringAndInteger.isAssignableFrom(substitutedEntrySetReturnType));
-  }
-
-  public void testGenericInheritance() {
-    final String text = "import java.util.*;\n" +
-                        "class Dummy {\n" +
-                        "  { Map<Integer, Integer> list = new HashMap<Integer, Integer>();}\n" +
-                        "}";
-    PsiJavaFile file = (PsiJavaFile)PsiFileFactory.getInstance(myProject).createFileFromText("Dummy.java", JavaFileType.INSTANCE, text);
-
-    PsiDeclarationStatement decl = (PsiDeclarationStatement)file.getClasses()[0].getInitializers()[0].getBody().getStatements()[0];
-    PsiVariable list = (PsiVariable)decl.getDeclaredElements()[0];
-    final PsiExpression initializer = list.getInitializer();
-    assert initializer != null : list;
-    final PsiType type = initializer.getType();
-    assert type != null : initializer;
-    assertTrue(list.getType().isAssignableFrom(type));
-  }
-
-  public void testSimplerGenericInheritance() {
-    PsiElementFactory factory = myJavaFacade.getElementFactory();
-    PsiClass map = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, RESOLVE_SCOPE);
-    PsiClass hashMap = myJavaFacade.findClass("java.util.HashMap", RESOLVE_SCOPE);
-    assert map != null && hashMap != null;
-    assertTrue(factory.createType(map).isAssignableFrom(factory.createType(hashMap)));
-  }
-
-  public void testAnnotations() {
-    PsiClass aClass = myJavaFacade.findClass("pack.Annotated", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiModifierList modifierList = aClass.getModifierList();
-    assert modifierList != null : aClass;
-    PsiAnnotation[] annotations = modifierList.getAnnotations();
-    assertTrue(annotations.length == 1);
-    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
-
-    PsiMethod[] methods = aClass.findMethodsByName("foo", false);
-    assertTrue(methods.length == 1);
-    annotations = methods[0].getModifierList().getAnnotations();
-    assertTrue(annotations.length == 1);
-    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
-
-    PsiParameter[] params = methods[0].getParameterList().getParameters();
-    assertTrue(params.length == 1);
-    modifierList = params[0].getModifierList();
-    assert modifierList != null : params[0];
-    annotations = modifierList.getAnnotations();
-    assertTrue(annotations.length == 1);
-    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
-
-    PsiField[] fields = aClass.getFields();
-    assertTrue(fields.length == 1);
-    modifierList = fields[0].getModifierList();
-    assert modifierList != null : fields[0];
-    annotations = modifierList.getAnnotations();
-    assertTrue(annotations.length == 1);
-    assertTrue(annotations[0].getText().equals("@pack.Annotation"));
-  }
-
-  public void testAnnotationMethodDefault() {
-    PsiClass aClass = myJavaFacade.findClass("pack.Annotation", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    PsiMethod[] methods = aClass.findMethodsByName("value", false);
-    assertTrue(methods.length == 1 && methods[0] instanceof PsiAnnotationMethod);
-    PsiAnnotationMemberValue defaultValue = ((PsiAnnotationMethod)methods[0]).getDefaultValue();
-    assertTrue(defaultValue != null);
-  }
-
-  public void testIndeterminateInAnnotationMethodDefault() {
-    final PsiClass aClass = myJavaFacade.findClass("pack.Annotation2", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    for (PsiMethod method : aClass.getMethods()) {
-      assert method instanceof PsiAnnotationMethod : method;
-      try {
-        final PsiAnnotationMemberValue defaultValue = ((PsiAnnotationMethod)method).getDefaultValue();
-        assert defaultValue instanceof PsiBinaryExpression : defaultValue;
-        final PsiPrimitiveType type = method.getName().startsWith("f") ? PsiType.FLOAT : PsiType.DOUBLE;
-        assertEquals(type, ((PsiBinaryExpression)defaultValue).getType());
-      }
-      catch (Exception e) {
-        final String valueText = ((PsiMethodStub)((StubBasedPsiElement)method).getStub()).getDefaultValueText();
-        fail("Unable to compute default value of method " + method + " from text '" + valueText + "': " + e.getMessage());
-      }
-    }
-  }
-
-  public void testEnum() {
-    PsiClass aClass = myJavaFacade.findClass("pack.MyEnum", GlobalSearchScope.allScope(myProject));
-    assert aClass != null;
-    checkValid(aClass);
-
-    assertTrue(aClass.isEnum());
-    PsiField[] fields = aClass.getFields();
-    PsiClassType type = myJavaFacade.getElementFactory().createType(aClass);
-    checkEnumConstant("RED", fields[0], type);
-    checkEnumConstant("GREEN", fields[1], type);
-    checkEnumConstant("BLUE", fields[2], type);
-  }
-
-  public void testVariance() {
-    final PsiClass aClass = myJavaFacade.findClass("pack.Variance", RESOLVE_SCOPE);
-    assert aClass != null;
-    checkValid(aClass);
-
-    final PsiMethod[] methodsByName = aClass.findMethodsByName("method", false);
-    assertEquals(1, methodsByName.length);
-    final PsiMethod methodsWithReturnType = methodsByName[0];
-    final PsiType returnType = methodsWithReturnType.getReturnType();
-    assert returnType != null : methodsWithReturnType;
-    assertEquals("pack.Parametrized<? extends T>", returnType.getCanonicalText());
-  }
-
-  private static void checkEnumConstant(String name, PsiField field, PsiClassType type) {
-    assertEquals(name, field.getName());
-    assertTrue(field instanceof PsiEnumConstant);
-    assertEquals(type, field.getType());
-  }
-
-  public void testInvariantParsing() {
-    final PsiClass collection = myJavaFacade.findClass("pack.Variance", RESOLVE_SCOPE);
-    assertNotNull(collection);
-    final PsiMethod[] methods = collection.findMethodsByName("removeAll", false);
-    assertEquals(1, methods.length);
-    final PsiParameter[] parameters = methods[0].getParameterList().getParameters();
-    assertEquals(1, parameters.length);
-    final PsiType parameterType = parameters[0].getType();
-    assertTrue(parameterType instanceof PsiClassType);
-    final PsiClassType psiClassType = ((PsiClassType)parameterType);
-    final PsiClassType.ClassResolveResult resolveResult = psiClassType.resolveGenerics();
-    final PsiClass resolveResultElement = resolveResult.getElement();
-    assert resolveResultElement != null : psiClassType;
-    final PsiTypeParameter[] typeParameters = resolveResultElement.getTypeParameters();
-    assertEquals(1, typeParameters.length);
-    final PsiType substitution = resolveResult.getSubstitutor().substitute(typeParameters[0]);
-    assertTrue(substitution instanceof PsiWildcardType);
-    assertEquals(PsiWildcardType.createUnbounded(myPsiManager), substitution);
-  }
-
-  public void testInvariantParsing2() {
-    disableJdk();
-    final PsiClass collection = myJavaFacade.findClass("java.util.Collection", RESOLVE_SCOPE);
-    assertNotNull(collection);
-    final PsiMethod[] methods = collection.findMethodsByName("removeAll", false);
-    assertEquals(1, methods.length);
-    final PsiParameter[] parameters = methods[0].getParameterList().getParameters();
-    assertEquals(1, parameters.length);
-    final PsiType parameterType = parameters[0].getType();
-    assertTrue(parameterType instanceof PsiClassType);
-    final PsiClassType psiClassType = ((PsiClassType)parameterType);
-    final PsiClassType.ClassResolveResult resolveResult = psiClassType.resolveGenerics();
-    final PsiClass resolveResultElement = resolveResult.getElement();
-    assert resolveResultElement != null : psiClassType;
-    final PsiTypeParameter[] typeParameters = resolveResultElement.getTypeParameters();
-    assertEquals(1, typeParameters.length);
-    final PsiType substitution = resolveResult.getSubstitutor().substitute(typeParameters[0]);
-    assertTrue(substitution instanceof PsiWildcardType);
-    assertEquals(PsiWildcardType.createUnbounded(myPsiManager), substitution);
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  public void testModifiers() {
-    PsiClass psiClass = myJavaFacade.findClass("pack.Modifiers", RESOLVE_SCOPE);
-    assertNotNull(psiClass);
-
-    PsiField f1 = psiClass.findFieldByName("f1", false);
-    assertEquals("private transient", f1.getModifierList().getText());
-    PsiField f2 = psiClass.findFieldByName("f2", false);
-    assertEquals("private volatile", f2.getModifierList().getText());
-    PsiMethod init = psiClass.findMethodsByName("Modifiers", false)[0];
-    assertEquals("public", init.getModifierList().getText());
-    PsiMethod m1 = psiClass.findMethodsByName("m1", false)[0];
-    assertEquals("private", m1.getModifierList().getText());
-    PsiMethod m2 = psiClass.findMethodsByName("m2", false)[0];
-    assertEquals("private synchronized", m2.getModifierList().getText());
-  }
-}
diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java
index d3364595536e..a197d480318b 100644
--- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,59 +18,46 @@ package com.intellij.psi.impl.cache.impl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.testFramework.PsiTestCase;
+import com.intellij.psi.PsiClass;
+import com.intellij.testFramework.IdeaTestCase;
 import com.intellij.testFramework.PsiTestUtil;
 
 import java.io.File;
-import java.io.IOException;
 
 /**
  * @author max
  */
-public class ClassFileUnderSourceRootTest extends PsiTestCase {
-  private static final String TEST_ROOT = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls";
-  private VirtualFile myDir;
-
+public class ClassFileUnderSourceRootTest extends IdeaTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
 
-    final File root = createTempDirectory();
+    File dir = createTempDirectory();
+    final VirtualFile root = LocalFileSystem.getInstance().findFileByIoFile(dir);
+    assertNotNull(root);
+
+    FileUtil.writeToFile(new File(dir, "p/A.java"), "package p;\npublic class A { }");
+    FileUtil.copy(new File(PathManagerEx.getTestDataPath() + "/psi/cls/repo/pack/MyClass.class"), new File(dir, "pack/MyClass.class"));
+
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
-        try {
-          VirtualFile rootVFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
-
-          myDir = rootVFile.createChildDirectory(null, "contentAndLibrary");
-
-          VirtualFile file1 = myDir.createChildData(null, "A.java");
-          VfsUtil.saveText(file1, "package p; public class A{ public void foo(); }");
-          PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
-          VfsUtilCore.copyFile(null, getClassFile(), myDir);
-
-          PsiTestUtil.addSourceRoot(myModule, myDir);
-          ModuleRootModificationUtil.addModuleLibrary(myModule, myDir.getUrl());
-        }
-        catch (IOException e) {
-          LOG.error(e);
-        }
+        PsiTestUtil.addSourceRoot(myModule, root);
+        ModuleRootModificationUtil.addModuleLibrary(myModule, root.getUrl());
       }
     });
   }
 
-  private static VirtualFile getClassFile() {
-    VirtualFile vDir = LocalFileSystem.getInstance().findFileByPath(TEST_ROOT.replace(File.separatorChar, '/'));
-    return vDir.findFileByRelativePath("pack/MyClass.class");
-  }
+  public void testFindClasses() {
+    PsiClass srcClass = myJavaFacade.findClass("p.A");
+    assertNotNull(srcClass);
+    assertEquals("p.A", srcClass.getQualifiedName());
 
-  public void testFindClass() throws Exception {
-    assertEquals("p.A", myJavaFacade.findClass("p.A").getQualifiedName());
-    assertEquals("pack.MyClass", myJavaFacade.findClass("pack.MyClass").getQualifiedName());
+    PsiClass pkgClass = myJavaFacade.findClass("pack.MyClass");
+    assertNotNull(pkgClass);
+    assertEquals("pack.MyClass", pkgClass.getQualifiedName());
   }
 }