From fbb3e0deb2f2201df919d2e38711b8bebeed1ccd Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 20 Nov 2019 15:14:08 -0800 Subject: [PATCH 1/2] fix: do not use console in system test --- templates/typescript_gapic/system-test/.eslintrc.yml.njk | 3 +-- .../system-test/fixtures/sample/src/index.js.njk | 1 - .../system-test/fixtures/sample/src/index.ts.njk | 1 - templates/typescript_gapic/system-test/install.ts.njk | 2 +- .../testdata/keymanager/system-test/.eslintrc.yml.baseline | 3 +-- .../system-test/fixtures/sample/src/index.js.baseline | 1 - .../system-test/fixtures/sample/src/index.ts.baseline | 1 - .../test/testdata/keymanager/system-test/install.ts.baseline | 2 +- .../test/testdata/showcase/system-test/.eslintrc.yml.baseline | 3 +-- .../showcase/system-test/fixtures/sample/src/index.js.baseline | 1 - .../showcase/system-test/fixtures/sample/src/index.ts.baseline | 1 - .../test/testdata/showcase/system-test/install.ts.baseline | 2 +- .../testdata/texttospeech/system-test/.eslintrc.yml.baseline | 3 +-- .../system-test/fixtures/sample/src/index.js.baseline | 1 - .../system-test/fixtures/sample/src/index.ts.baseline | 1 - .../test/testdata/texttospeech/system-test/install.ts.baseline | 2 +- .../test/testdata/translate/system-test/.eslintrc.yml.baseline | 3 +-- .../system-test/fixtures/sample/src/index.js.baseline | 1 - .../system-test/fixtures/sample/src/index.ts.baseline | 1 - .../test/testdata/translate/system-test/install.ts.baseline | 2 +- 20 files changed, 10 insertions(+), 25 deletions(-) diff --git a/templates/typescript_gapic/system-test/.eslintrc.yml.njk b/templates/typescript_gapic/system-test/.eslintrc.yml.njk index 8553d5024..dac42e90f 100644 --- a/templates/typescript_gapic/system-test/.eslintrc.yml.njk +++ b/templates/typescript_gapic/system-test/.eslintrc.yml.njk @@ -18,5 +18,4 @@ limitations under the License. --- env: mocha: true -rules: - no-console: off + diff --git a/templates/typescript_gapic/system-test/fixtures/sample/src/index.js.njk b/templates/typescript_gapic/system-test/fixtures/sample/src/index.js.njk index 1e869dba9..88624a283 100644 --- a/templates/typescript_gapic/system-test/fixtures/sample/src/index.js.njk +++ b/templates/typescript_gapic/system-test/fixtures/sample/src/index.js.njk @@ -24,7 +24,6 @@ const {{ api.naming.productName.toKebabCase()}} = require('{{ api.publishName }} function main() { {%- for service in api.services %} const {{ service.name.toCamelCase() -}}Client = new {{ api.naming.productName.toKebabCase() }}.{{ service.name.toPascalCase() + 'Client' }}(); - console.log("{{- service.name.toCamelCase() -}}Client was created!"); {%- endfor %} } diff --git a/templates/typescript_gapic/system-test/fixtures/sample/src/index.ts.njk b/templates/typescript_gapic/system-test/fixtures/sample/src/index.ts.njk index 9f617615f..426af6e17 100644 --- a/templates/typescript_gapic/system-test/fixtures/sample/src/index.ts.njk +++ b/templates/typescript_gapic/system-test/fixtures/sample/src/index.ts.njk @@ -28,7 +28,6 @@ import { function main() { {%- for service in api.services %} const {{ service.name.toCamelCase() -}}Client = new {{ service.name.toPascalCase() + 'Client' -}}(); - console.log("{{- service.name.toCamelCase() -}}Client was created!"); {%- endfor %} } diff --git a/templates/typescript_gapic/system-test/install.ts.njk b/templates/typescript_gapic/system-test/install.ts.njk index d474741ba..d16a16754 100644 --- a/templates/typescript_gapic/system-test/install.ts.njk +++ b/templates/typescript_gapic/system-test/install.ts.njk @@ -17,7 +17,7 @@ limitations under the License. -#} {% import "../_license.njk" as license -%} {{license.license()}} -import {packNTest} from 'pack-n-play'; +import { packNTest } from 'pack-n-play'; import { readFileSync } from 'fs'; describe('typescript consumer tests', () => { diff --git a/typescript/test/testdata/keymanager/system-test/.eslintrc.yml.baseline b/typescript/test/testdata/keymanager/system-test/.eslintrc.yml.baseline index f9605165c..dc5d9b017 100644 --- a/typescript/test/testdata/keymanager/system-test/.eslintrc.yml.baseline +++ b/typescript/test/testdata/keymanager/system-test/.eslintrc.yml.baseline @@ -1,5 +1,4 @@ --- env: mocha: true -rules: - no-console: off + diff --git a/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.js.baseline b/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.js.baseline index c01656213..87744e944 100644 --- a/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.js.baseline +++ b/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.js.baseline @@ -22,7 +22,6 @@ const kms = require('kms'); function main() { const keyManagementServiceClient = new kms.KeyManagementServiceClient(); - console.log("keyManagementServiceClient was created!"); } main(); diff --git a/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.ts.baseline b/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.ts.baseline index 310e4c51e..24565a9b2 100644 --- a/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.ts.baseline +++ b/typescript/test/testdata/keymanager/system-test/fixtures/sample/src/index.ts.baseline @@ -20,7 +20,6 @@ import {KeyManagementServiceClient} from 'kms'; function main() { const keyManagementServiceClient = new KeyManagementServiceClient(); - console.log("keyManagementServiceClient was created!"); } main(); diff --git a/typescript/test/testdata/keymanager/system-test/install.ts.baseline b/typescript/test/testdata/keymanager/system-test/install.ts.baseline index faa7e02aa..51fd2b43b 100644 --- a/typescript/test/testdata/keymanager/system-test/install.ts.baseline +++ b/typescript/test/testdata/keymanager/system-test/install.ts.baseline @@ -16,7 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** -import {packNTest} from 'pack-n-play'; +import { packNTest } from 'pack-n-play'; import { readFileSync } from 'fs'; describe('typescript consumer tests', () => { diff --git a/typescript/test/testdata/showcase/system-test/.eslintrc.yml.baseline b/typescript/test/testdata/showcase/system-test/.eslintrc.yml.baseline index f9605165c..dc5d9b017 100644 --- a/typescript/test/testdata/showcase/system-test/.eslintrc.yml.baseline +++ b/typescript/test/testdata/showcase/system-test/.eslintrc.yml.baseline @@ -1,5 +1,4 @@ --- env: mocha: true -rules: - no-console: off + diff --git a/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.js.baseline b/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.js.baseline index 30170cd20..ef0d46e97 100644 --- a/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.js.baseline +++ b/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.js.baseline @@ -22,7 +22,6 @@ const showcase = require('showcase'); function main() { const echoClient = new showcase.EchoClient(); - console.log("echoClient was created!"); } main(); diff --git a/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.ts.baseline b/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.ts.baseline index dca99e9fb..5c63ed9e3 100644 --- a/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.ts.baseline +++ b/typescript/test/testdata/showcase/system-test/fixtures/sample/src/index.ts.baseline @@ -20,7 +20,6 @@ import {EchoClient} from 'showcase'; function main() { const echoClient = new EchoClient(); - console.log("echoClient was created!"); } main(); diff --git a/typescript/test/testdata/showcase/system-test/install.ts.baseline b/typescript/test/testdata/showcase/system-test/install.ts.baseline index faa7e02aa..51fd2b43b 100644 --- a/typescript/test/testdata/showcase/system-test/install.ts.baseline +++ b/typescript/test/testdata/showcase/system-test/install.ts.baseline @@ -16,7 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** -import {packNTest} from 'pack-n-play'; +import { packNTest } from 'pack-n-play'; import { readFileSync } from 'fs'; describe('typescript consumer tests', () => { diff --git a/typescript/test/testdata/texttospeech/system-test/.eslintrc.yml.baseline b/typescript/test/testdata/texttospeech/system-test/.eslintrc.yml.baseline index f9605165c..dc5d9b017 100644 --- a/typescript/test/testdata/texttospeech/system-test/.eslintrc.yml.baseline +++ b/typescript/test/testdata/texttospeech/system-test/.eslintrc.yml.baseline @@ -1,5 +1,4 @@ --- env: mocha: true -rules: - no-console: off + diff --git a/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.js.baseline b/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.js.baseline index d76868e97..e844b2d64 100644 --- a/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.js.baseline +++ b/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.js.baseline @@ -22,7 +22,6 @@ const texttospeech = require('@google-cloud/text-to-speech'); function main() { const textToSpeechClient = new texttospeech.TextToSpeechClient(); - console.log("textToSpeechClient was created!"); } main(); diff --git a/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.ts.baseline b/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.ts.baseline index 3d5e706fb..9d09bcf52 100644 --- a/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.ts.baseline +++ b/typescript/test/testdata/texttospeech/system-test/fixtures/sample/src/index.ts.baseline @@ -20,7 +20,6 @@ import {TextToSpeechClient} from '@google-cloud/text-to-speech'; function main() { const textToSpeechClient = new TextToSpeechClient(); - console.log("textToSpeechClient was created!"); } main(); diff --git a/typescript/test/testdata/texttospeech/system-test/install.ts.baseline b/typescript/test/testdata/texttospeech/system-test/install.ts.baseline index faa7e02aa..51fd2b43b 100644 --- a/typescript/test/testdata/texttospeech/system-test/install.ts.baseline +++ b/typescript/test/testdata/texttospeech/system-test/install.ts.baseline @@ -16,7 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** -import {packNTest} from 'pack-n-play'; +import { packNTest } from 'pack-n-play'; import { readFileSync } from 'fs'; describe('typescript consumer tests', () => { diff --git a/typescript/test/testdata/translate/system-test/.eslintrc.yml.baseline b/typescript/test/testdata/translate/system-test/.eslintrc.yml.baseline index f9605165c..dc5d9b017 100644 --- a/typescript/test/testdata/translate/system-test/.eslintrc.yml.baseline +++ b/typescript/test/testdata/translate/system-test/.eslintrc.yml.baseline @@ -1,5 +1,4 @@ --- env: mocha: true -rules: - no-console: off + diff --git a/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.js.baseline b/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.js.baseline index 5a8ae307a..c73df1375 100644 --- a/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.js.baseline +++ b/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.js.baseline @@ -22,7 +22,6 @@ const translation = require('translation'); function main() { const translationServiceClient = new translation.TranslationServiceClient(); - console.log("translationServiceClient was created!"); } main(); diff --git a/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.ts.baseline b/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.ts.baseline index d2ec87f5e..2ae5a579e 100644 --- a/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.ts.baseline +++ b/typescript/test/testdata/translate/system-test/fixtures/sample/src/index.ts.baseline @@ -20,7 +20,6 @@ import {TranslationServiceClient} from 'translation'; function main() { const translationServiceClient = new TranslationServiceClient(); - console.log("translationServiceClient was created!"); } main(); diff --git a/typescript/test/testdata/translate/system-test/install.ts.baseline b/typescript/test/testdata/translate/system-test/install.ts.baseline index faa7e02aa..51fd2b43b 100644 --- a/typescript/test/testdata/translate/system-test/install.ts.baseline +++ b/typescript/test/testdata/translate/system-test/install.ts.baseline @@ -16,7 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** -import {packNTest} from 'pack-n-play'; +import { packNTest } from 'pack-n-play'; import { readFileSync } from 'fs'; describe('typescript consumer tests', () => { From fc48f679a2fb369c6bc89cb38bdc1da878d2b851 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 20 Nov 2019 15:24:16 -0800 Subject: [PATCH 2/2] fix: baselines --- .../test/testdata/redis/system-test/.eslintrc.yml.baseline | 3 +-- .../redis/system-test/fixtures/sample/src/index.js.baseline | 1 - .../redis/system-test/fixtures/sample/src/index.ts.baseline | 1 - typescript/test/testdata/redis/system-test/install.ts.baseline | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/typescript/test/testdata/redis/system-test/.eslintrc.yml.baseline b/typescript/test/testdata/redis/system-test/.eslintrc.yml.baseline index f9605165c..dc5d9b017 100644 --- a/typescript/test/testdata/redis/system-test/.eslintrc.yml.baseline +++ b/typescript/test/testdata/redis/system-test/.eslintrc.yml.baseline @@ -1,5 +1,4 @@ --- env: mocha: true -rules: - no-console: off + diff --git a/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.js.baseline b/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.js.baseline index 25c720efd..ecddaf4f4 100644 --- a/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.js.baseline +++ b/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.js.baseline @@ -22,7 +22,6 @@ const redis = require('redis'); function main() { const cloudRedisClient = new redis.CloudRedisClient(); - console.log("cloudRedisClient was created!"); } main(); diff --git a/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.ts.baseline b/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.ts.baseline index 8b7550c15..7f78de8ac 100644 --- a/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.ts.baseline +++ b/typescript/test/testdata/redis/system-test/fixtures/sample/src/index.ts.baseline @@ -20,7 +20,6 @@ import {CloudRedisClient} from 'redis'; function main() { const cloudRedisClient = new CloudRedisClient(); - console.log("cloudRedisClient was created!"); } main(); diff --git a/typescript/test/testdata/redis/system-test/install.ts.baseline b/typescript/test/testdata/redis/system-test/install.ts.baseline index faa7e02aa..51fd2b43b 100644 --- a/typescript/test/testdata/redis/system-test/install.ts.baseline +++ b/typescript/test/testdata/redis/system-test/install.ts.baseline @@ -16,7 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** -import {packNTest} from 'pack-n-play'; +import { packNTest } from 'pack-n-play'; import { readFileSync } from 'fs'; describe('typescript consumer tests', () => {