From dcab3b295f6b041ca91bc84114a591ec8f5ab397 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 1 Sep 2022 16:24:17 +0200
Subject: [PATCH] test(java): remove unused test code (#17564)
---
.github/workflows/build.yml | 1 -
.../manager/gradle/__testutil__/gradle.ts | 102 ------------------
2 files changed, 103 deletions(-)
delete mode 100644 lib/modules/manager/gradle/__testutil__/gradle.ts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0f52d0bdb3..eb82247daa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,6 @@ env:
DEFAULT_BRANCH: main
NODE_VERSION: 14
DRY_RUN: true
- SKIP_JAVA_TESTS: true
jobs:
test:
diff --git a/lib/modules/manager/gradle/__testutil__/gradle.ts b/lib/modules/manager/gradle/__testutil__/gradle.ts
deleted file mode 100644
index d673ee31cc..0000000000
--- a/lib/modules/manager/gradle/__testutil__/gradle.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { SpawnSyncReturns, spawnSync } from 'child_process';
-
-const failIfNoJavaEnv = 'CI';
-
-const gradleJavaVersionSupport = {
- 5: { min: 8, max: 12 },
- 6: { min: 8, max: 13 },
-};
-
-const skipJava = process.env.SKIP_JAVA_TESTS === 'true';
-const enforceJava = process.env[failIfNoJavaEnv] === 'true' && !skipJava;
-
-function parseJavaVersion(javaVersionOutput: string | undefined): number {
- const versionMatch = /version "(?:1\.)?(\d+)[\d._-]*"/.exec(
- javaVersionOutput ?? ''
- );
- if (versionMatch?.length === 2) {
- return parseInt(versionMatch[1], 10);
- }
- if (enforceJava) {
- throw Error(`This test suite needs Java and ${failIfNoJavaEnv} is set. However, we cannot parse the Java version.
-The output of java -version was:
-${
- // TODO: types (#7154)
- // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
- javaVersionOutput
-}`);
- }
- return 0;
-}
-
-let cachedJavaVersion: number | null = null;
-
-function determineJavaVersion(): number {
- if (cachedJavaVersion === null) {
- let javaVersionCommand: SpawnSyncReturns<string> | undefined;
- let error: Error | undefined;
- try {
- javaVersionCommand = spawnSync('java', ['-version'], {
- encoding: 'utf8',
- windowsHide: true,
- });
- } catch (e) {
- error = e;
- }
- if (javaVersionCommand?.error) {
- error = javaVersionCommand.error;
- }
- if (error) {
- if (!enforceJava) {
- return 0;
- }
- throw Error(
- `This test suite needs Java and ${failIfNoJavaEnv} is set.
-Result of java -version:
-${error.toString()}`
- );
- }
- cachedJavaVersion = parseJavaVersion(javaVersionCommand?.stderr);
- }
- return cachedJavaVersion;
-}
-
-class WithGradle {
- private gradleSupportsThisJavaVersion: boolean;
-
- constructor(gradleVersion: keyof typeof gradleJavaVersionSupport) {
- const javaVersion = determineJavaVersion();
- if (gradleJavaVersionSupport[gradleVersion] === undefined) {
- throw Error(`Unknown gradle version '${gradleVersion}'!`);
- }
-
- const supportedJavaVersions = gradleJavaVersionSupport[gradleVersion] as {
- min: number;
- max: number;
- };
- this.gradleSupportsThisJavaVersion =
- javaVersion >= supportedJavaVersions.min &&
- javaVersion <= supportedJavaVersions.max;
- if (!this.gradleSupportsThisJavaVersion && enforceJava) {
- throw Error(
- `This test needs a Java version between ${supportedJavaVersions.min} and ${supportedJavaVersions.max}. The current Java version is ${javaVersion} and ${failIfNoJavaEnv} is set!`
- );
- }
- }
-
- get it(): jest.It {
- return !this.gradleSupportsThisJavaVersion || skipJava ? it.skip : it;
- }
-
- get describe(): jest.Describe {
- return !this.gradleSupportsThisJavaVersion || skipJava
- ? describe.skip
- : describe;
- }
-}
-
-export function ifSystemSupportsGradle(
- gradleVersion: keyof typeof gradleJavaVersionSupport
-): WithGradle {
- return new WithGradle(gradleVersion);
-}
--
GitLab