TestGenerator -> JSTestGenerator, extract single test generation functionality to a separate class

js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java

@@ -44,7 +44,7 @@ import org.jetbrains.k2js.translate.expression.WhenTranslator;
 import org.jetbrains.k2js.translate.initializer.ClassInitializerTranslator;
 import org.jetbrains.k2js.translate.initializer.NamespaceInitializerTranslator;
 import org.jetbrains.k2js.translate.reference.CallBuilder;
-import org.jetbrains.k2js.translate.test.TestGenerator;
+import org.jetbrains.k2js.translate.test.JSTestGenerator;
 import org.jetbrains.k2js.translate.utils.JsAstUtils;
 import org.jetbrains.k2js.translate.utils.TranslationUtils;
 import org.jetbrains.k2js.translate.utils.dangerous.DangerousData;
@@ -186,7 +186,7 @@ public final class Translation {
                 statements.add(statement);
             }
         }
-        TestGenerator.generateTestCalls(context, files, rootBlock);
+        JSTestGenerator.generateTestCalls(context, files, rootBlock);
         performSimpleNameMangling(context.program());
         return context.program();
     }

js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java

@@ -16,8 +16,10 @@
 
 package org.jetbrains.k2js.translate.test;
 
-import com.google.dart.compiler.backend.js.ast.*;
+import com.google.dart.compiler.backend.js.ast.JsBlock;
-import com.google.dart.compiler.util.AstUtil;
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsNew;
+import com.google.dart.compiler.backend.js.ast.JsStringLiteral;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
@@ -31,13 +33,11 @@ import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
 import java.util.Collection;
 import java.util.List;
 
-import static com.google.dart.compiler.util.AstUtil.newBlock;
-
 /**
  * @author Pavel Talanov
  */
-public final class TestGenerator {
+public final class JSTestGenerator {
-    private TestGenerator() {
+    private JSTestGenerator() {
     }
 
     public static void generateTestCalls(@NotNull TranslationContext context,
@@ -56,16 +56,11 @@ public final class TestGenerator {
                 return;
             }
             JsExpression expression = ReferenceTranslator.translateAsFQReference(classDescriptor, context);
-            JsNew constructClassExpr = new JsNew(expression);
+            JsNew testClass = new JsNew(expression);
-            JsExpression functionToTestCall =
+            JsExpression functionToTestCall = CallBuilder.build(context).descriptor(functionDescriptor).receiver(testClass).translate();
-                    CallBuilder.build(context).descriptor(functionDescriptor).receiver(constructClassExpr).translate();
+
-            JsNameRef qUnitTestFunRef = AstUtil.newQualifiedNameRef("QUnit.test");
+            JsStringLiteral testName = context.program().getStringLiteral(classDescriptor.getName() + "." + functionDescriptor.getName());
-            JsFunction functionToTest = new JsFunction(context.jsScope());
+            (new JSTester(block, context)).constructTestMethodInvocation(functionToTestCall, testName);
-            functionToTest.setBody(newBlock(functionToTestCall.makeStmt()));
-            String testName = classDescriptor.getName() + "." + functionDescriptor.getName();
-            block.getStatements()
-                    .add(AstUtil.newInvocation(qUnitTestFunRef, context.program().getStringLiteral(testName), functionToTest)
-                                 .makeStmt());
         }
     }
 }

js/js.translator/src/org/jetbrains/k2js/translate/test/JSTester.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.k2js.translate.test;
+
+import com.google.dart.compiler.backend.js.ast.*;
+import com.google.dart.compiler.util.AstUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+
+import static com.google.dart.compiler.util.AstUtil.newBlock;
+import static com.google.dart.compiler.util.AstUtil.newInvocation;
+
+/**
+ * @author Pavel Talanov
+ */
+public class JSTester {
+
+    @NotNull
+    private final JsBlock block;
+    @NotNull
+    private final TranslationContext context;
+    @NotNull
+    private static final JsNameRef TEST_FUN_REF = AstUtil.newQualifiedNameRef("QUnit.test");
+
+    public JSTester(@NotNull JsBlock block, @NotNull TranslationContext context) {
+        this.block = block;
+        this.context = context;
+    }
+
+    void constructTestMethodInvocation(@NotNull JsExpression functionToTestCall,
+            @NotNull JsStringLiteral testName) {
+        JsFunction functionToTest = new JsFunction(this.context.jsScope());
+        functionToTest.setBody(newBlock(functionToTestCall.makeStmt()));
+        block.getStatements().add(newInvocation(TEST_FUN_REF, testName, functionToTest).makeStmt());
+    }
+}