From bced28ee410d816b6cbe58d1f05aadfb940aad99 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 23 Apr 2015 20:25:45 +0300
Subject: [PATCH] Minor in JS: simplify count vars directive

---
 .../kotlin/js/test/utils/DirectiveTestUtils.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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<T extends JsNode> extends DirectiveHandler {
+    private static class CountNodesDirective<T extends JsNode> extends DirectiveHandler {
 
         @NotNull
         private final Class<T> 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<JsLabel>("CHECK_LABELS_COUNT", JsLabel.class) {
@@ -137,12 +139,7 @@ public class DirectiveTestUtils {
         }
     };
 
-    private static final DirectiveHandler COUNT_VARS = new CountNodesDirective<JsVars>("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<JsVars.JsVar>("CHECK_VARS_COUNT", JsVars.JsVar.class);
 
     private static final DirectiveHandler HAS_INLINE_METADATA = new DirectiveHandler("CHECK_HAS_INLINE_METADATA") {
         @Override