Minor. Fix java test data to make it actually compilable

This commit is contained in:
Denis Zharkov
2017-09-11 13:10:09 +03:00
parent fdc6b37264
commit 58a0ca61a9
6 changed files with 11 additions and 10 deletions
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierDefault; import javax.annotation.meta.TypeQualifierDefault;
@Target(ElementType.CLASS) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull @Nonnull
@@ -15,7 +15,7 @@ public fun main(/*0*/ a: A): kotlin.Unit
package spr { package spr {
@kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented @javax.annotation.Nonnull @javax.annotation.meta.TypeQualifierDefault(value = {ElementType.TYPE_USE}) public final annotation class NonNullApi : kotlin.Annotation { @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FILE}) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotation.MustBeDocumented @javax.annotation.Nonnull @javax.annotation.meta.TypeQualifierDefault(value = {ElementType.TYPE_USE}) public final annotation class NonNullApi : kotlin.Annotation {
public constructor NonNullApi() public constructor NonNullApi()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -13,26 +13,26 @@ class Outer {
class B extends A { class B extends A {
@Override @Override
Base<String> foo() {} Base<String> foo() { return null; }
} }
class C extends A { class C extends A {
@Override @Override
@NonNull Base<String> foo() {} @NonNull Base<String> foo() { return null; }
} }
class D extends A { class D extends A {
@Override @Override
Derived<String> foo() {} Derived<String> foo() { return null; }
} }
class E extends A { class E extends A {
@Override @Override
@NonNull Derived<String> foo() {} @NonNull Derived<String> foo() { return null; }
} }
class F extends A { class F extends A {
@Override @Override
@NonNull Derived<@NonNull String> foo() {} @NonNull Derived<@NonNull String> foo() { return null; }
} }
} }
@@ -1,3 +1,5 @@
// FILE: Base.java
public interface Base<T> {}
// FILE: A.java // FILE: A.java
import org.checkerframework.checker.nullness.qual.*; import org.checkerframework.checker.nullness.qual.*;
@@ -8,7 +10,6 @@ public class A {
// FILE: a.kt // FILE: a.kt
interface Base<T> {}
interface Derived<E> : Base<E> {} interface Derived<E> : Base<E> {}
fun bar1(): Derived<String> = null!! fun bar1(): Derived<String> = null!!
@@ -19,7 +19,7 @@ public final class B : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public interface Base</*0*/ T> { public interface Base</*0*/ T : kotlin.Any!> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -4,5 +4,5 @@ import org.checkerframework.checker.nullness.qual.*;
import java.util.*; import java.util.*;
class A { class A {
List<@NonNull String> foo() {} List<@NonNull String> foo() { return null; }
} }