Get rid of ParametersAreNonnullByDefault copy in test data
This commit is contained in:
-28
@@ -1,28 +0,0 @@
|
|||||||
package javax.annotation;
|
|
||||||
|
|
||||||
import java.lang.annotation.Documented;
|
|
||||||
import java.lang.annotation.ElementType;
|
|
||||||
import java.lang.annotation.Retention;
|
|
||||||
import java.lang.annotation.RetentionPolicy;
|
|
||||||
|
|
||||||
import javax.annotation.meta.TypeQualifierDefault;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This annotation can be applied to a package, class or method to indicate that
|
|
||||||
* the method parameters in that element are nonnull by default unless there is:
|
|
||||||
* <ul>
|
|
||||||
* <li>An explicit nullness annotation
|
|
||||||
* <li>The method overrides a method in a superclass (in which case the
|
|
||||||
* annotation of the corresponding parameter in the superclass applies)
|
|
||||||
* <li>There is a default parameter annotation (like {@link ParametersAreNullableByDefault})
|
|
||||||
* applied to a more tightly nested element.
|
|
||||||
* </ul>
|
|
||||||
*
|
|
||||||
* @see Nonnull
|
|
||||||
*/
|
|
||||||
@Documented
|
|
||||||
@Nonnull
|
|
||||||
@TypeQualifierDefault(ElementType.PARAMETER)
|
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
|
||||||
public @interface ParametersAreNonnullByDefault {
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
-Xjsr305-annotations=enable
|
-Xjsr305-annotations=enable
|
||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
-Xjsr305-annotations=ignore
|
-Xjsr305-annotations=ignore
|
||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
-Xjsr305-annotations=warn
|
-Xjsr305-annotations=warn
|
||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
+1
@@ -1,5 +1,6 @@
|
|||||||
-Xjsr305=ignore
|
-Xjsr305=ignore
|
||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
+1
@@ -1,4 +1,5 @@
|
|||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
+1
@@ -1,5 +1,6 @@
|
|||||||
-Xjsr305=strict
|
-Xjsr305=strict
|
||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
+1
@@ -1,5 +1,6 @@
|
|||||||
-Xjsr305=warn
|
-Xjsr305=warn
|
||||||
$TESTDATA_DIR$/jsr305Usage.kt
|
$TESTDATA_DIR$/jsr305Usage.kt
|
||||||
$TESTDATA_DIR$/jsr305
|
$TESTDATA_DIR$/jsr305
|
||||||
|
$FOREIGN_ANNOTATIONS_DIR$
|
||||||
-d
|
-d
|
||||||
$TEMP_DIR$
|
$TEMP_DIR$
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import kotlin.collections.CollectionsKt;
|
|||||||
import kotlin.io.FilesKt;
|
import kotlin.io.FilesKt;
|
||||||
import kotlin.text.Charsets;
|
import kotlin.text.Charsets;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.kotlin.checkers.AbstractForeignAnnotationsTestKt;
|
||||||
import org.jetbrains.kotlin.cli.common.CLITool;
|
import org.jetbrains.kotlin.cli.common.CLITool;
|
||||||
import org.jetbrains.kotlin.cli.common.ExitCode;
|
import org.jetbrains.kotlin.cli.common.ExitCode;
|
||||||
import org.jetbrains.kotlin.cli.js.K2JSCompiler;
|
import org.jetbrains.kotlin.cli.js.K2JSCompiler;
|
||||||
@@ -162,7 +163,11 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
|
|||||||
|
|
||||||
return argsWithColonsReplaced
|
return argsWithColonsReplaced
|
||||||
.replace("$TEMP_DIR$", tempDir)
|
.replace("$TEMP_DIR$", tempDir)
|
||||||
.replace("$TESTDATA_DIR$", new File(argsFilePath).getParent());
|
.replace("$TESTDATA_DIR$", new File(argsFilePath).getParent())
|
||||||
|
.replace(
|
||||||
|
"$FOREIGN_ANNOTATIONS_DIR$",
|
||||||
|
new File(AbstractForeignAnnotationsTestKt.getFOREIGN_ANNOTATIONS_SOURCES_PATH()).getPath()
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user