From d765196758619ddb4af9539e518617d08aa34ddd Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 19 Nov 2013 16:00:48 +0400 Subject: [PATCH] Refactoring: remove warnings --- .../jet/generators/tests/generator/SimpleTestClassModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java index c6501e5813b..31a4336b265 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; public class SimpleTestClassModel implements TestClassModel { private static final Comparator BY_NAME = new Comparator() { @Override - public int compare(TestEntityModel o1, TestEntityModel o2) { + public int compare(@NotNull TestEntityModel o1, @NotNull TestEntityModel o2) { return o1.getName().compareTo(o2.getName()); } }; @@ -59,13 +59,14 @@ public class SimpleTestClassModel implements TestClassModel { if (!rootFile.isDirectory() || !recursive) { return Collections.emptyList(); } + if (innerTestClasses == null) { List children = Lists.newArrayList(); File[] files = rootFile.listFiles(); if (files != null) { for (File file : files) { if (file.isDirectory()) { - children.add(new SimpleTestClassModel(file, recursive, filenamePattern, doTestMethodName)); + children.add(new SimpleTestClassModel(file, true, filenamePattern, doTestMethodName)); } } }