Move teamcity reporting only to nodejs

libraries/tools/kotlin-test-js-runner/karma.ts

@@ -4,7 +4,7 @@
  */
 
 import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser";
-import {getAdapter} from "./src/Adapter";
+import {getFilteringAdapter} from "./src/Adapter";
 
 const kotlin_test = require('kotlin-test');
 
@@ -20,4 +20,4 @@ const parser = new CliArgsParser(cliDescription);
 const untypedArgs = parser.parse(processArgs);
 
 const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$();
-kotlin_test.setAdapter(getAdapter(initialAdapter, untypedArgs));
+kotlin_test.setAdapter(getFilteringAdapter(initialAdapter, untypedArgs));

libraries/tools/kotlin-test-js-runner/nodejs.ts

@@ -1,6 +1,9 @@
 import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser";
-import {getAdapter} from "./src/Adapter";
+import {getFilteringAdapter} from "./src/Adapter";
 import {directRunner} from "./src/KotlinTestRunner";
+import {IgnoredTestSuitesReporting, runWithTeamCityReporter} from "./src/KotlinTestTeamCityReporter";
+import {hrTimer} from "./src/Timer";
+import {TeamCityMessagesFlow} from "./src/TeamCityMessagesFlow";
 
 const kotlin_test = require('kotlin-test');
 
@@ -8,7 +11,15 @@ const parser = new CliArgsParser(getDefaultCliDescription());
 
 const processArgs = process.argv.slice(2);
 const untypedArgs = parser.parse(processArgs);
-kotlin_test.setAdapter(getAdapter(directRunner, untypedArgs));
+
+const realConsoleLog = console.log;
+const teamCity = new TeamCityMessagesFlow(null, (payload) => realConsoleLog(payload));
+
+const onIgnoredTestSuites = (untypedArgs.ignoredTestSuites
+    || IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored) as IgnoredTestSuitesReporting;
+
+const runner = runWithTeamCityReporter(directRunner, onIgnoredTestSuites, teamCity, hrTimer);
+kotlin_test.setAdapter(getFilteringAdapter(runner, untypedArgs));
 
 untypedArgs.free.forEach((arg: string) => {
     require(arg);

libraries/tools/kotlin-test-js-runner/src/Adapter.ts

@@ -4,28 +4,19 @@
  */
 
 import {CliArgValues} from "./CliArgsParser";
-import {IgnoredTestSuitesReporting, runWithTeamCityReporter} from "./KotlinTestTeamCityReporter";
-import {TeamCityMessagesFlow} from "./TeamCityMessagesFlow";
 import {KotlinTestRunner} from "./KotlinTestRunner";
-import {hrTimer} from "./Timer";
 import {configureFiltering} from "./CliFiltertingConfiguration";
 
-export function getAdapter(
+export function getFilteringAdapter(
     initialAdapter: KotlinTestRunner,
     cliArgsValue: CliArgValues
 ): KotlinTestRunner {
     const args = {
-        onIgnoredTestSuites: (cliArgsValue.ignoredTestSuites
-            || IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored) as IgnoredTestSuitesReporting,
         include: cliArgsValue.include as string[],
         exclude: cliArgsValue.exclude as string[],
     };
 
-    const realConsoleLog = console.log;
-    const teamCity = new TeamCityMessagesFlow(null, (payload) => realConsoleLog(payload));
-
     let runner: KotlinTestRunner = initialAdapter;
-    runner = runWithTeamCityReporter(runner, args.onIgnoredTestSuites, teamCity, hrTimer);
     runner = configureFiltering(runner, args.include, args.exclude);
 
     return runner;