From 3b291128854b43de3aa0a779ad1d37eee5f16791 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 10 Oct 2019 16:37:56 +0300 Subject: [PATCH] [Gradle, JS] Remove redundant related with JS test run --- .../kotlin/gradle/targets/js/NpmVersions.kt | 2 -- .../targets/js/testing/karma/KotlinKarma.kt | 1 - libraries/tools/kotlin-test-js-runner/karma.ts | 9 ++++----- libraries/tools/kotlin-test-js-runner/nodejs.ts | 8 ++++---- .../tools/kotlin-test-js-runner/src/Adapter.ts | 2 +- .../src/KotlinTestRunner.ts | 11 +---------- .../src/KotlinTestTeamCityReporter.ts | 2 +- .../tools/kotlin-test-js-runner/src/Timer.ts | 16 ---------------- 8 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 libraries/tools/kotlin-test-js-runner/src/Timer.ts diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index c0ef09dd324..f12da2d1efb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -45,8 +45,6 @@ class NpmVersions { val karmaSourceMapLoader = NpmPackageVersion("karma-sourcemap-loader", "0.3.7") - val browserProcessHrtime = NpmPackageVersion("browser-process-hrtime", "1.0.0") - val puppeteer = NpmPackageVersion("puppeteer", "1.19.0") val kotlinJsTestRunner = KotlinGradleNpmPackage("test-js-runner") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index f918db56628..a7ed963c973 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -141,7 +141,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF private fun useWebpack() { createAdapterJs() - requiredDependencies.add(versions.browserProcessHrtime) requiredDependencies.add(versions.karmaWebpack) requiredDependencies.add(versions.webpack) diff --git a/libraries/tools/kotlin-test-js-runner/karma.ts b/libraries/tools/kotlin-test-js-runner/karma.ts index b86861796a8..ab17350fde7 100755 --- a/libraries/tools/kotlin-test-js-runner/karma.ts +++ b/libraries/tools/kotlin-test-js-runner/karma.ts @@ -4,13 +4,12 @@ */ import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser"; -import {getFilteringAdapter} from "./src/Adapter"; +import {runWithFilteringAdapter} from "./src/Adapter"; import {TeamCityMessagesFlow} from "./src/TeamCityMessagesFlow"; -import {runWithTeamCityReporter} from "./src/KotlinTestTeamCityReporter"; +import {runWithTeamCityConsoleAdapter} from "./src/KotlinTestTeamCityReporter"; const kotlin_test = require('kotlin-test'); -process.hrtime = require('browser-process-hrtime'); process.exit = (exitCode) => { throw new Error(`Exit with ${exitCode}`) }; @@ -25,9 +24,9 @@ const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$(); const realConsoleLog = console.log; const teamCity = new TeamCityMessagesFlow(null, (payload) => realConsoleLog(payload)); -const teamCityAdapter = runWithTeamCityReporter(initialAdapter, teamCity); +const teamCityAdapter = runWithTeamCityConsoleAdapter(initialAdapter, teamCity); -kotlin_test.setAdapter(getFilteringAdapter(teamCityAdapter, untypedArgs)); +kotlin_test.setAdapter(runWithFilteringAdapter(teamCityAdapter, untypedArgs)); const resultFun = window.__karma__.result; window.__karma__.result = function (result) { diff --git a/libraries/tools/kotlin-test-js-runner/nodejs.ts b/libraries/tools/kotlin-test-js-runner/nodejs.ts index ab438ec6579..b56fd3405a0 100755 --- a/libraries/tools/kotlin-test-js-runner/nodejs.ts +++ b/libraries/tools/kotlin-test-js-runner/nodejs.ts @@ -1,6 +1,6 @@ import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser"; -import {getFilteringAdapter} from "./src/Adapter"; -import {runWithTeamCityReporter} from "./src/KotlinTestTeamCityReporter"; +import {runWithFilteringAdapter} from "./src/Adapter"; +import {runWithTeamCityConsoleAdapter} from "./src/KotlinTestTeamCityReporter"; import {TeamCityMessagesFlow} from "./src/TeamCityMessagesFlow"; const kotlin_test = require('kotlin-test'); @@ -36,5 +36,5 @@ const initialAdapter = new kotlin_test.kotlin.test.adapters.JasmineLikeAdapter() const realConsoleLog = console.log; const teamCity = new TeamCityMessagesFlow(null, (payload) => realConsoleLog(payload)); -const teamCityAdapter = runWithTeamCityReporter(initialAdapter, teamCity); -kotlin_test.setAdapter(getFilteringAdapter(teamCityAdapter, untypedArgs)); \ No newline at end of file +const teamCityAdapter = runWithTeamCityConsoleAdapter(initialAdapter, teamCity); +kotlin_test.setAdapter(runWithFilteringAdapter(teamCityAdapter, untypedArgs)); \ No newline at end of file diff --git a/libraries/tools/kotlin-test-js-runner/src/Adapter.ts b/libraries/tools/kotlin-test-js-runner/src/Adapter.ts index 81bea9790eb..56c30754f7f 100644 --- a/libraries/tools/kotlin-test-js-runner/src/Adapter.ts +++ b/libraries/tools/kotlin-test-js-runner/src/Adapter.ts @@ -7,7 +7,7 @@ import {CliArgValues} from "./CliArgsParser"; import {KotlinTestRunner} from "./KotlinTestRunner"; import {configureFiltering} from "./CliFiltertingConfiguration"; -export function getFilteringAdapter( +export function runWithFilteringAdapter( initialAdapter: KotlinTestRunner, cliArgsValue: CliArgValues ): KotlinTestRunner { diff --git a/libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts index 46f58e1aa85..485587df3c6 100644 --- a/libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts +++ b/libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts @@ -2,13 +2,4 @@ export interface KotlinTestRunner { suite(name: string, isIgnored: boolean, fn: () => void): void test(name: string, isIgnored: boolean, fn: () => void): void -} - -export const directRunner: KotlinTestRunner = { - suite(name: string, isIgnored: boolean, fn: () => void): void { - if (!isIgnored) fn() - }, - test(name: string, isIgnored: boolean, fn: () => void): void { - if (!isIgnored) fn() - } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts index 3add8139f82..1cfc85450e6 100644 --- a/libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts +++ b/libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts @@ -18,7 +18,7 @@ function withName(name: string, data?: TeamCityMessageData): TeamCityMessageData return data } -export function runWithTeamCityReporter( +export function runWithTeamCityConsoleAdapter( runner: KotlinTestRunner, teamCity: TeamCityMessagesFlow ): KotlinTestRunner { diff --git a/libraries/tools/kotlin-test-js-runner/src/Timer.ts b/libraries/tools/kotlin-test-js-runner/src/Timer.ts deleted file mode 100644 index fd577604ed7..00000000000 --- a/libraries/tools/kotlin-test-js-runner/src/Timer.ts +++ /dev/null @@ -1,16 +0,0 @@ -export interface Timer { - start(): T - - end(start: T): number -} - -export const hrTimer: Timer<[number, number]> = { - start(): [number, number] { - return process.hrtime(); - }, - end(start: [number, number]): number { - const elapsedHr = process.hrtime(start); - return elapsedHr[0] + (elapsedHr[1] / 1e6); // ns to ms - } -}; -