From d783bbe5e9b8dcf5f41ef48de6b577c080a0b90e Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Tue, 28 Feb 2023 01:31:54 +0100 Subject: [PATCH] [Tests] Do not throw assert in TestFiles.createTestFiles This assert makes a test red even if it contains IGNORE_BACKEND directive --- .../org/jetbrains/kotlin/test/TestFiles.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java index f8c3ad6425e..b2b84f1d06e 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java @@ -156,17 +156,15 @@ public class TestFiles { for (M module : modules.values()) { if (module != null) { - module.getDependencies().addAll(module.dependenciesSymbols.stream().map(name -> { - M dep = modules.get(name); - assert dep != null : "Dependency not found: " + name + " for module " + module.name; - return dep; - }).collect(Collectors.toList())); + module.getDependencies().addAll(module.dependenciesSymbols.stream() + .map(modules::get) + .filter(Objects::nonNull) + .collect(Collectors.toList())); - module.getFriends().addAll(module.friendsSymbols.stream().map(name -> { - M dep = modules.get(name); - assert dep != null : "Dependency not found: " + name + " for module " + module.name; - return dep; - }).collect(Collectors.toList())); + module.getFriends().addAll(module.friendsSymbols.stream() + .map(modules::get) + .filter(Objects::nonNull) + .collect(Collectors.toList())); } }