aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickreid <nickreid@google.com>2023-10-17 20:50:26 -0700
committerCopybara-Service <copybara-worker@google.com>2023-10-17 20:51:02 -0700
commit82b4447e5fb8cb166216b5d5d1ab5935041b3400 (patch)
tree2942014a429b3b8cca496db7cad8450bc157a375
parentecffe6215bb1117daba5caa5a1525fc628fc2cd6 (diff)
downloadbazelbuild-kotlin-rules-82b4447e5fb8cb166216b5d5d1ab5935041b3400.tar.gz
Delete some unused files
PiperOrigin-RevId: 574343814
-rw-r--r--tests/analysis/BUILD2
-rw-r--r--tests/analysis/testinputs/Bar.java21
-rw-r--r--tests/analysis/testinputs/CommonSrcs.kt19
-rw-r--r--tests/analysis/testinputs/Data.java21
-rw-r--r--tests/analysis/testinputs/Deps.java21
-rw-r--r--tests/analysis/testinputs/Foo.java21
-rw-r--r--tests/analysis/testinputs/Resources.java21
-rw-r--r--tests/analysis/testinputs/RuntimeDeps.java21
-rw-r--r--tests/analysis/testinputs/Srcs.kt19
-rw-r--r--tests/analysis/util.bzl27
-rw-r--r--tests/jvm/analysis/jvm_library/friends/sub/BUILD14
-rw-r--r--tests/jvm/analysis/jvm_library/friends/testing/BUILD21
-rw-r--r--tests/jvm/java/srcartifacts/BUILD17
13 files changed, 22 insertions, 223 deletions
diff --git a/tests/analysis/BUILD b/tests/analysis/BUILD
index 84f96dc..7a4d844 100644
--- a/tests/analysis/BUILD
+++ b/tests/analysis/BUILD
@@ -14,6 +14,4 @@
# Analysis Tests
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
licenses(["notice"])
diff --git a/tests/analysis/testinputs/Bar.java b/tests/analysis/testinputs/Bar.java
deleted file mode 100644
index c69a114..0000000
--- a/tests/analysis/testinputs/Bar.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs;
-
-public class Bar {
- public Bar() {}
-}
diff --git a/tests/analysis/testinputs/CommonSrcs.kt b/tests/analysis/testinputs/CommonSrcs.kt
deleted file mode 100644
index 932e704..0000000
--- a/tests/analysis/testinputs/CommonSrcs.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs
-
-class CommonSrcs
diff --git a/tests/analysis/testinputs/Data.java b/tests/analysis/testinputs/Data.java
deleted file mode 100644
index d8e161f..0000000
--- a/tests/analysis/testinputs/Data.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs;
-
-final class Data {
- private Data() {}
-}
diff --git a/tests/analysis/testinputs/Deps.java b/tests/analysis/testinputs/Deps.java
deleted file mode 100644
index 7f5237f..0000000
--- a/tests/analysis/testinputs/Deps.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs;
-
-final class Deps {
- private Deps() {}
-}
diff --git a/tests/analysis/testinputs/Foo.java b/tests/analysis/testinputs/Foo.java
deleted file mode 100644
index 249811a..0000000
--- a/tests/analysis/testinputs/Foo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs;
-
-public class Foo {
- public Foo() {}
-}
diff --git a/tests/analysis/testinputs/Resources.java b/tests/analysis/testinputs/Resources.java
deleted file mode 100644
index cbf6e7c..0000000
--- a/tests/analysis/testinputs/Resources.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs;
-
-final class Resources {
- private Resources() {}
-}
diff --git a/tests/analysis/testinputs/RuntimeDeps.java b/tests/analysis/testinputs/RuntimeDeps.java
deleted file mode 100644
index 5515a7a..0000000
--- a/tests/analysis/testinputs/RuntimeDeps.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs;
-
-final class RuntimeDeps {
- private RuntimeDeps() {}
-}
diff --git a/tests/analysis/testinputs/Srcs.kt b/tests/analysis/testinputs/Srcs.kt
deleted file mode 100644
index 89ca40c..0000000
--- a/tests/analysis/testinputs/Srcs.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * * Copyright 2022 Google LLC. All rights reserved.
- *
- * 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 testinputs
-
-class Srcs
diff --git a/tests/analysis/util.bzl b/tests/analysis/util.bzl
deleted file mode 100644
index 773f0e6..0000000
--- a/tests/analysis/util.bzl
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Google LLC. All rights reserved.
-#
-# 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.
-
-"""Some utils"""
-
-load("//:visibility.bzl", "RULES_KOTLIN")
-load("//kotlin/common/testing:testing_rules.bzl", "kt_testing_rules")
-
-visibility(RULES_KOTLIN)
-
-# Mark targets that's aren't expected to build, but are needed for analysis test assertions.
-ONLY_FOR_ANALYSIS_TEST_TAGS = kt_testing_rules.ONLY_FOR_ANALYSIS_TAGS
-
-create_file = kt_testing_rules.create_file
-
-create_dir = kt_testing_rules.create_dir
diff --git a/tests/jvm/analysis/jvm_library/friends/sub/BUILD b/tests/jvm/analysis/jvm_library/friends/sub/BUILD
index d71eb2b..7f4a38e 100644
--- a/tests/jvm/analysis/jvm_library/friends/sub/BUILD
+++ b/tests/jvm/analysis/jvm_library/friends/sub/BUILD
@@ -12,10 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("//kotlin:rules.bzl", "kt_jvm_library")
-load("//kotlin/jvm/testing:for_analysis.bzl", "kt_for_analysis")
+load("//kotlin/jvm/testing:for_analysis.bzl", ktfa = "kt_for_analysis")
load("//kotlin/jvm/testing:jvm_library_analysis_test.bzl", "kt_jvm_library_analysis_test")
-load("//tests/analysis:util.bzl", "ONLY_FOR_ANALYSIS_TEST_TAGS")
package(
default_applicable_licenses = ["//:license"],
@@ -31,7 +29,7 @@ kt_jvm_library_analysis_test(
"libkt_exports_friend-compile.jar",
# Absent # "libfriend-compile.jar"
],
- target_under_test = kt_for_analysis.kt_jvm_library(
+ target_under_test = ktfa.kt_jvm_library(
name = "no_kt_exported_friend_cross_package",
srcs = ["Input.kt"],
deps = [":kt_exports_friend"],
@@ -41,22 +39,20 @@ kt_jvm_library_analysis_test(
kt_jvm_library_analysis_test(
name = "no_direct_friend_cross_package_test",
expected_friend_jar_names = [],
- target_under_test = kt_for_analysis.kt_jvm_library(
+ target_under_test = ktfa.kt_jvm_library(
name = "no_direct_friend_cross_package",
srcs = ["Input.kt"],
deps = ["//tests/jvm/analysis/jvm_library/friends:friend"],
),
)
-kt_jvm_library(
+ktfa.kt_jvm_library(
name = "kt_exports_friend",
srcs = ["Input.kt"],
- tags = ONLY_FOR_ANALYSIS_TEST_TAGS,
exports = ["//tests/jvm/analysis/jvm_library/friends:friend"],
)
-kt_jvm_library(
+ktfa.kt_jvm_library(
name = "subfriend",
srcs = ["Input.kt"],
- tags = ONLY_FOR_ANALYSIS_TEST_TAGS,
)
diff --git a/tests/jvm/analysis/jvm_library/friends/testing/BUILD b/tests/jvm/analysis/jvm_library/friends/testing/BUILD
index cd93965..0ab1bba 100644
--- a/tests/jvm/analysis/jvm_library/friends/testing/BUILD
+++ b/tests/jvm/analysis/jvm_library/friends/testing/BUILD
@@ -12,10 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("//kotlin:rules.bzl", "kt_jvm_library")
-load("//kotlin/jvm/testing:for_analysis.bzl", "kt_for_analysis")
+load("//kotlin/jvm/testing:for_analysis.bzl", ktfa = "kt_for_analysis")
load("//kotlin/jvm/testing:jvm_library_analysis_test.bzl", "kt_jvm_library_analysis_test")
-load("//tests/analysis:util.bzl", "ONLY_FOR_ANALYSIS_TEST_TAGS")
package(
default_applicable_licenses = ["//:license"],
@@ -31,7 +29,7 @@ kt_jvm_library_analysis_test(
"libkt_exports_friend-compile.jar",
"libfriend-compile.jar",
],
- target_under_test = kt_for_analysis.kt_jvm_library(
+ target_under_test = ktfa.kt_jvm_library(
name = "has_kt_exported_friend_impl_package",
srcs = ["Input.kt"],
deps = [":kt_exports_friend"],
@@ -43,7 +41,7 @@ kt_jvm_library_analysis_test(
expected_friend_jar_names = [
"libfriend-compile.jar",
],
- target_under_test = kt_for_analysis.kt_jvm_library(
+ target_under_test = ktfa.kt_jvm_library(
name = "has_direct_friend_impl_package",
srcs = ["Input.kt"],
deps = ["//tests/jvm/analysis/jvm_library/friends:friend"],
@@ -56,7 +54,7 @@ kt_jvm_library_analysis_test(
"libkt_exports_subfriend-compile.jar",
# Absent # "subfriend-compile.jar"
],
- target_under_test = kt_for_analysis.kt_jvm_library(
+ target_under_test = ktfa.kt_jvm_library(
name = "no_kt_exported_friend_sibling_package",
srcs = ["Input.kt"],
deps = [":kt_exports_subfriend"],
@@ -66,29 +64,26 @@ kt_jvm_library_analysis_test(
kt_jvm_library_analysis_test(
name = "no_direct_friend_sibling_package_test",
expected_friend_jar_names = [],
- target_under_test = kt_for_analysis.kt_jvm_library(
+ target_under_test = ktfa.kt_jvm_library(
name = "no_direct_friend_sibling_package",
srcs = ["Input.kt"],
deps = ["//tests/jvm/analysis/jvm_library/friends/sub:subfriend"],
),
)
-kt_jvm_library(
+ktfa.kt_jvm_library(
name = "kt_exports_subfriend",
srcs = ["Input.kt"],
- tags = ONLY_FOR_ANALYSIS_TEST_TAGS,
exports = ["//tests/jvm/analysis/jvm_library/friends/sub:subfriend"],
)
-kt_jvm_library(
+ktfa.kt_jvm_library(
name = "kt_exports_friend",
srcs = ["Input.kt"],
- tags = ONLY_FOR_ANALYSIS_TEST_TAGS,
exports = ["//tests/jvm/analysis/jvm_library/friends:friend"],
)
-kt_jvm_library(
+ktfa.kt_jvm_library(
name = "testingfriend",
srcs = ["Input.kt"],
- tags = ONLY_FOR_ANALYSIS_TEST_TAGS,
)
diff --git a/tests/jvm/java/srcartifacts/BUILD b/tests/jvm/java/srcartifacts/BUILD
index 9d51c82..e974d73 100644
--- a/tests/jvm/java/srcartifacts/BUILD
+++ b/tests/jvm/java/srcartifacts/BUILD
@@ -13,10 +13,11 @@
# limitations under the License.
load("//kotlin:rules.bzl", "kt_jvm_library", "kt_jvm_test")
-load("//tests/analysis:util.bzl", "create_dir", "create_file")
+load("//kotlin/common/testing:testing_rules.bzl", "kt_testing_rules")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
package(
+ default_applicable_licenses = ["//:license"],
default_testonly = 1,
)
@@ -43,7 +44,7 @@ kt_jvm_test(
],
)
-create_dir(
+kt_testing_rules.create_dir(
name = "dir/java",
srcs = [
"JavaInJavaDir.java",
@@ -51,7 +52,7 @@ create_dir(
subdir = "srcartifacts",
)
-create_dir(
+kt_testing_rules.create_dir(
name = "dir/kotlin",
srcs = [
"KtInKotlinDir.kt",
@@ -59,16 +60,16 @@ create_dir(
subdir = "srcartifacts",
)
-create_dir(
+kt_testing_rules.create_dir(
name = "dir/empty",
srcs = [],
subdir = "srcartifacts/empty",
)
-create_dir(
+kt_testing_rules.create_dir(
name = "dir/resources",
srcs = [
- create_file(
+ kt_testing_rules.create_file(
name = "resources_in_resources_dir.txt",
content = "Test resource content.",
),
@@ -92,7 +93,7 @@ java_library(
kt_jvm_library(
name = "empty_java_tree_artifact",
srcs = [
- create_dir(
+ kt_testing_rules.create_dir(
name = "dir/empty_java/java",
srcs = [],
subdir = "srcartifacts",
@@ -103,7 +104,7 @@ kt_jvm_library(
kt_jvm_library(
name = "empty_kotlin_tree_artifact",
srcs = [
- create_dir(
+ kt_testing_rules.create_dir(
name = "dir/empty_kotlin/kotlin",
srcs = [],
subdir = "srcartifacts",