Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
dcab3b29
Unverified
Commit
dcab3b29
authored
2 years ago
by
Michael Kriese
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
test(java): remove unused test code (#17564)
parent
97930a65
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.github/workflows/build.yml
+0
-1
0 additions, 1 deletion
.github/workflows/build.yml
lib/modules/manager/gradle/__testutil__/gradle.ts
+0
-102
0 additions, 102 deletions
lib/modules/manager/gradle/__testutil__/gradle.ts
with
0 additions
and
103 deletions
.github/workflows/build.yml
+
0
−
1
View file @
dcab3b29
...
...
@@ -26,7 +26,6 @@ env:
DEFAULT_BRANCH
:
main
NODE_VERSION
:
14
DRY_RUN
:
true
SKIP_JAVA_TESTS
:
true
jobs
:
test
:
...
...
This diff is collapsed.
Click to expand it.
lib/modules/manager/gradle/__testutil__/gradle.ts
deleted
100644 → 0
+
0
−
102
View file @
97930a65
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
);
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment