diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java index 5aa51e8075e..aa05f7e1003 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java @@ -91,7 +91,7 @@ public class DirectiveTestUtils { } }; - private abstract static class CountNodesDirective extends DirectiveHandler { + private static class CountNodesDirective extends DirectiveHandler { @NotNull private final Class klass; @@ -121,7 +121,9 @@ public class DirectiveTestUtils { assertEquals(message, expectedCount, actualCount); } - protected abstract int getActualCountFor(@NotNull T node, @NotNull ArgumentsHelper arguments); + protected int getActualCountFor(@NotNull T node, @NotNull ArgumentsHelper arguments) { + return 1; + } } private static final DirectiveHandler COUNT_LABELS = new CountNodesDirective("CHECK_LABELS_COUNT", JsLabel.class) { @@ -137,12 +139,7 @@ public class DirectiveTestUtils { } }; - private static final DirectiveHandler COUNT_VARS = new CountNodesDirective("CHECK_VARS_COUNT", JsVars.class) { - @Override - protected int getActualCountFor(@NotNull JsVars node, @NotNull ArgumentsHelper arguments) { - return node.getVars().size(); - } - }; + private static final DirectiveHandler COUNT_VARS = new CountNodesDirective("CHECK_VARS_COUNT", JsVars.JsVar.class); private static final DirectiveHandler HAS_INLINE_METADATA = new DirectiveHandler("CHECK_HAS_INLINE_METADATA") { @Override