azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Remove redundant related with JS test run

Browse Source
This commit is contained in:
Ilya Goncharov
2019-10-10 16:37:56 +03:00
parent 287351a4c2
commit 3b29112885
8 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
-2
View File
@@ -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")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
-1
View File
@@ -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)
libraries/tools/kotlin-test-js-runner/karma.ts
+4 -5
View File
@@ -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) {
libraries/tools/kotlin-test-js-runner/nodejs.ts
+4 -4
View File
@@ -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));
const teamCityAdapter = runWithTeamCityConsoleAdapter(initialAdapter, teamCity);
kotlin_test.setAdapter(runWithFilteringAdapter(teamCityAdapter, untypedArgs));
libraries/tools/kotlin-test-js-runner/src/Adapter.ts
+1 -1
View File
@@ -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 {
libraries/tools/kotlin-test-js-runner/src/KotlinTestRunner.ts
+1 -10
View File
@@ -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()
}
};
}
libraries/tools/kotlin-test-js-runner/src/KotlinTestTeamCityReporter.ts
+1 -1
View File
@@ -18,7 +18,7 @@ function withName(name: string, data?: TeamCityMessageData): TeamCityMessageData
return data
}
export function runWithTeamCityReporter(
export function runWithTeamCityConsoleAdapter(
runner: KotlinTestRunner,
teamCity: TeamCityMessagesFlow
): KotlinTestRunner {
libraries/tools/kotlin-test-js-runner/src/Timer.ts
-16
View File
@@ -1,16 +0,0 @@
export interface Timer<T> {
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
}
};