-
Notifications
You must be signed in to change notification settings - Fork 476
Issue #1227: Fix module testing not working due to call to JUnit internal API #2187
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Choosechee
wants to merge
4
commits into
spockframework:master
Choose a base branch
from
Choosechee:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3179128
Replaced usage of internal JUnit API with custom method
Choosechee 400262c
Removed commented-out import
Choosechee e00a056
Replaced usage of internal JUnit API with custom method
Choosechee c13d54f
Merge branch 'master' into master
AndreasTu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
spock-core/src/main/java/org/spockframework/util/ClassUtil.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright 2025 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.spockframework.util; | ||
|
|
||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.Arrays; | ||
| import static java.util.stream.Collectors.joining; | ||
|
|
||
| public class ClassUtil { | ||
| public static @NotNull String nullSafeToString(@Nullable Class<?> clazz) { | ||
| if (clazz != null) | ||
| return clazz.toString(); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
| else | ||
| return "null"; | ||
| } | ||
|
|
||
| // not an overload because I couldn't fix | ||
| // ambiguous overload errors in the spec | ||
| public static @NotNull String allNullSafeToString(@Nullable Class<?>... clazzes) { | ||
| if (clazzes != null) | ||
| return Arrays.stream(clazzes) | ||
| .map(ClassUtil::nullSafeToString) | ||
| .collect(joining(", ")); | ||
| else | ||
| return ""; | ||
| } | ||
| } | ||
61 changes: 61 additions & 0 deletions
61
spock-specs/src/test/groovy/org/spockframework/util/ClassUtilSpec.groovy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package org.spockframework.util | ||
|
|
||
| import spock.lang.Specification | ||
|
|
||
| class ClassUtilSpec extends Specification { | ||
| def 'get string representation of non-null class'() { | ||
| expect: | ||
| ClassUtil.nullSafeToString(clazz) == clazz.toString() | ||
| where: | ||
| clazz << [Set.class, Tuple.class, ClassUtil.class] | ||
| } | ||
|
|
||
| def 'get string representation of null class'() { | ||
| when: | ||
| String result = ClassUtil.nullSafeToString(null) | ||
| then: | ||
| notThrown(NullPointerException) | ||
| result == 'null' | ||
| } | ||
|
|
||
| def 'get string representation of multiple potentially null classes'(Class<?>... clazzes) { | ||
| given: | ||
| def clazzStrings = [] | ||
| for (clazz in clazzes) { | ||
| clazzStrings.add(ClassUtil.nullSafeToString(clazz)) | ||
| } | ||
| when: | ||
| String result = ClassUtil.allNullSafeToString(clazzes) | ||
| then: 'result is names from single class overload separated by a comma and space each' | ||
| notThrown(NullPointerException) | ||
| result == String.join(', ', clazzStrings) | ||
| where: | ||
| clazzes << [[List.class, Set.class, Queue.class, Map.class], | ||
| [File.class, null, URL.class], | ||
| [null, null]] | ||
| } | ||
|
|
||
| def 'get string representation of one class not known to be just one'() { | ||
| given: | ||
| Class<?>[] singleton = [Specification.class] | ||
| Class<?>[] singletonOfNull = [null] | ||
| expect: | ||
| ClassUtil.allNullSafeToString(singleton) == ClassUtil.nullSafeToString(Specification.class) | ||
| ClassUtil.allNullSafeToString(singletonOfNull) == ClassUtil.nullSafeToString(null) | ||
| } | ||
|
|
||
| def 'get string representation of no classes'() { | ||
| expect: | ||
| ClassUtil.allNullSafeToString() == '' | ||
| } | ||
|
|
||
| def 'get string representation of null array of classes'() { | ||
| given: | ||
| Class<?>[] nullArray = null | ||
| when: | ||
| String result = ClassUtil.allNullSafeToString(nullArray) | ||
| then: | ||
| notThrown(NullPointerException) | ||
| result == '' | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a line in
docs\release_notes.adocunder