From 005ecc5f296e9bf693b6276616ee5bb228b758b0 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 9 Apr 2020 19:18:16 +0300
Subject: [PATCH] [Gradle, JS] Add TeamCity simple message log4js appender

#KT-38109 fixed
---
 .../src/teamcity-format.d.ts                  | 22 ++++++++++++++++++-
 .../src/teamcity-format.js                    |  2 ++
 .../kotlin-test-js-runner/tc-log-appender.js  |  4 ++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-test-js-runner/src/teamcity-format.d.ts b/libraries/tools/kotlin-test-js-runner/src/teamcity-format.d.ts
index a21fc0cb006d0..b1a87d1715afa 100644
--- a/libraries/tools/kotlin-test-js-runner/src/teamcity-format.d.ts
+++ b/libraries/tools/kotlin-test-js-runner/src/teamcity-format.d.ts
@@ -1 +1,21 @@
-export function tcEscape(str: string): string
\ No newline at end of file
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+export const TEST_IGNORED: string
+export const SUITE_START: string
+export const SUITE_END: string
+export const SUITE_END_NO_DURATION: string
+export const TEST_START: string
+export const TEST_FAILED: string
+export const TEST_FAILED_COMPARISON: string
+export const TEST_END: string
+export const TEST_END_NO_DURATION: string
+export const BLOCK_OPENED: string
+export const BLOCK_CLOSED: string
+export const SIMPLE_MESSAGE: string
+
+export function tcEscape(str: string): string
+
+export function formatMessage(...str: string[]): string
\ No newline at end of file
diff --git a/libraries/tools/kotlin-test-js-runner/src/teamcity-format.js b/libraries/tools/kotlin-test-js-runner/src/teamcity-format.js
index 9eecf18943872..58871c51f32be 100644
--- a/libraries/tools/kotlin-test-js-runner/src/teamcity-format.js
+++ b/libraries/tools/kotlin-test-js-runner/src/teamcity-format.js
@@ -16,6 +16,8 @@ export const TEST_END_NO_DURATION = `##teamcity[testFinished name='%s' flowId='%
 export const BLOCK_OPENED = `##teamcity[blockOpened name='%s' flowId='%s']`
 export const BLOCK_CLOSED = `##teamcity[blockClosed name='%s' flowId='%s']`
 
+export const SIMPLE_MESSAGE = `##teamcity[message text='%s']`
+
 /**
  * from teamcity-service-messages
  * Copyright (c) 2013 Aaron Forsander
diff --git a/libraries/tools/kotlin-test-js-runner/tc-log-appender.js b/libraries/tools/kotlin-test-js-runner/tc-log-appender.js
index d07ef9b7163d8..fa043319deb54 100644
--- a/libraries/tools/kotlin-test-js-runner/tc-log-appender.js
+++ b/libraries/tools/kotlin-test-js-runner/tc-log-appender.js
@@ -5,13 +5,13 @@
 
 'use strict';
 
-import {tcEscape} from "./src/teamcity-format"
+import {formatMessage, SIMPLE_MESSAGE} from "./src/teamcity-format"
 
 const consoleLog = console.log.bind(console);
 
 function consoleAppender(layout, timezoneOffset) {
     return (loggingEvent) => {
-        consoleLog(tcEscape(layout(loggingEvent, timezoneOffset)));
+        consoleLog(formatMessage(SIMPLE_MESSAGE, layout(loggingEvent, timezoneOffset)));
     };
 }