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

Fixed JdkAnnotationsSanityTest.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-10 17:59:35 +04:00
parent 1dc928b5db
commit feb484cccb
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/RawTypesCheck.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class RawTypesCheck {
}
for (HierarchicalMethodSignature superSignature : method.getHierarchicalMethodSignature().getSuperSignatures()) {
if (hasRawTypesInSignature(superSignature.getMethod())) {
if (superSignature.isRaw() || hasRawTypesInSignature(superSignature.getMethod())) {
return true;
}
}
compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
+7 -2
View File
@@ -91,7 +91,9 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
for (FqName javaClass : affectedClasses) {
ClassDescriptor topLevelClass = javaDescriptorResolver.resolveClass(javaClass);
NamespaceDescriptor topLevelNamespace = javaDescriptorResolver.resolveNamespace(javaClass);
assertNotNull("Class has annotation, but it is not found: " + javaClass, topLevelClass);
if (topLevelClass == null) {
continue;
}
topLevelClass.acceptVoid(visitor);
@@ -256,7 +258,10 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull JetScope memberScope) {
for (DeclarationDescriptor member : memberScope.getAllDescriptors()) {
member.acceptVoid(this);
if (member instanceof DeclarationDescriptorWithVisibility
&& ((DeclarationDescriptorWithVisibility) member).getVisibility().isPublicAPI()) {
member.acceptVoid(this);
}
}
return visitDeclaration(descriptor);
jdk-annotations/java/util/concurrent/annotations.xml
+11
View File
@@ -1,4 +1,15 @@
<root>
<item name='java.util.concurrent.BlockingQueue int drainTo(java.util.Collection&lt;? super E&gt;, int)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun drainTo(c : MutableCollection<in E>, maxElements: Int) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.concurrent.BlockingQueue int drainTo(java.util.Collection&lt;? super E&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun drainTo(c : MutableCollection<in E>) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.concurrent.ConcurrentNavigableMap java.util.concurrent.ConcurrentNavigableMap&lt;K,V&gt; headMap(K, boolean) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>