|
6 | 6 | #include "test_framework.h" |
7 | 7 | #include "test_helpers.h" |
8 | 8 | #include "discover/discover.h" |
| 9 | +#include "discover/discover_policy_internal.h" |
9 | 10 | #include "foundation/platform.h" |
10 | 11 |
|
11 | 12 | typedef struct { |
@@ -1328,6 +1329,58 @@ TEST(discover_cbmignore_negates_always_skip_dir) { |
1328 | 1329 | PASS(); |
1329 | 1330 | } |
1330 | 1331 |
|
| 1332 | +/* ── JVM packages named like build output (issue #2661) ─────────── */ |
| 1333 | + |
| 1334 | +/* Below src/<set>/{java,kotlin,scala,groovy}/ every directory is a package, so |
| 1335 | + * "target", "tmp", "vendor" there are package names, not build output. */ |
| 1336 | +TEST(jvm_package_path_predicate_issue2661) { |
| 1337 | + ASSERT_TRUE(cbm_discover_path_in_jvm_package("src/main/java/com/acme/target")); |
| 1338 | + ASSERT_TRUE(cbm_discover_path_in_jvm_package("app/src/test/kotlin/x/tmp")); |
| 1339 | + ASSERT_TRUE(cbm_discover_path_in_jvm_package("src/main/scala/vendor")); |
| 1340 | + /* The language root itself and its siblings are not packages. */ |
| 1341 | + ASSERT_FALSE(cbm_discover_path_in_jvm_package("src/main/java")); |
| 1342 | + ASSERT_FALSE(cbm_discover_path_in_jvm_package("src/main/target")); |
| 1343 | + ASSERT_FALSE(cbm_discover_path_in_jvm_package("target")); |
| 1344 | + ASSERT_FALSE(cbm_discover_path_in_jvm_package("module/target/classes")); |
| 1345 | + ASSERT_FALSE(cbm_discover_path_in_jvm_package("src/java/main/tmp")); |
| 1346 | + ASSERT_FALSE(cbm_discover_path_in_jvm_package(NULL)); |
| 1347 | + PASS(); |
| 1348 | +} |
| 1349 | + |
| 1350 | +TEST(discover_keeps_jvm_packages_named_like_build_dirs_issue2661) { |
| 1351 | + char *base = th_mktempdir("cbm_disc_jvm_pkg"); |
| 1352 | + ASSERT(base != NULL); |
| 1353 | + |
| 1354 | + th_write_file(TH_PATH(base, "src/main/java/com/acme/target/Foo.java"), |
| 1355 | + "package com.acme.target;\nclass Foo {}\n"); |
| 1356 | + th_write_file(TH_PATH(base, "src/test/java/com/acme/tmp/T.java"), |
| 1357 | + "package com.acme.tmp;\nclass T {}\n"); |
| 1358 | + th_write_file(TH_PATH(base, "src/main/kotlin/com/acme/vendor/V.kt"), |
| 1359 | + "package com.acme.vendor\nclass V\n"); |
| 1360 | + /* Real build output stays skipped. */ |
| 1361 | + th_write_file(TH_PATH(base, "target/classes/Gen.java"), "class Gen {}\n"); |
| 1362 | + th_write_file(TH_PATH(base, "src/main/target/Out.java"), "class Out {}\n"); |
| 1363 | + /* The safety core is never un-skipped, even below a package root. */ |
| 1364 | + th_write_file(TH_PATH(base, "src/main/java/com/.git/H.java"), "class H {}\n"); |
| 1365 | + |
| 1366 | + cbm_discover_opts_t opts = {0}; |
| 1367 | + cbm_file_info_t *files = NULL; |
| 1368 | + int count = 0; |
| 1369 | + int rc = cbm_discover(base, &opts, &files, &count); |
| 1370 | + ASSERT_EQ(rc, 0); |
| 1371 | + ASSERT_TRUE(discover_has_rel_path(files, count, "src/main/java/com/acme/target/Foo.java")); |
| 1372 | + ASSERT_TRUE(discover_has_rel_path(files, count, "src/test/java/com/acme/tmp/T.java")); |
| 1373 | + ASSERT_TRUE(discover_has_rel_path(files, count, "src/main/kotlin/com/acme/vendor/V.kt")); |
| 1374 | + ASSERT_FALSE(discover_has_rel_path(files, count, "target/classes/Gen.java")); |
| 1375 | + ASSERT_FALSE(discover_has_rel_path(files, count, "src/main/target/Out.java")); |
| 1376 | + ASSERT_FALSE(discover_has_rel_path(files, count, "src/main/java/com/.git/H.java")); |
| 1377 | + ASSERT_EQ(count, 3); |
| 1378 | + |
| 1379 | + cbm_discover_free(files, count); |
| 1380 | + th_cleanup(base); |
| 1381 | + PASS(); |
| 1382 | +} |
| 1383 | + |
1331 | 1384 | /* ── Laravel compiled Blade view cache (issue #1735) ─────────────── */ |
1332 | 1385 |
|
1333 | 1386 | /* storage/framework/views/ holds Laravel's compiled Blade templates: generated |
@@ -2381,6 +2434,8 @@ SUITE(discover) { |
2381 | 2434 | RUN_TEST(skip_venv); |
2382 | 2435 | RUN_TEST(skip_dist); |
2383 | 2436 | RUN_TEST(skip_target); |
| 2437 | + RUN_TEST(jvm_package_path_predicate_issue2661); |
| 2438 | + RUN_TEST(discover_keeps_jvm_packages_named_like_build_dirs_issue2661); |
2384 | 2439 | RUN_TEST(skip_vendor); |
2385 | 2440 | RUN_TEST(skip_vendored); |
2386 | 2441 | RUN_TEST(skip_terraform); |
|
0 commit comments