root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.6.x

This commit is contained in:
Moritz Halbritter 2022-03-07 14:11:11 +01:00
parent 564555347f f3eb90046f
commit e980a53399
3 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOs.java
View File

@ -17,7 +17,6 @@
package org.springframework.boot.testsupport.junit; package org.springframework.boot.testsupport.junit;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
@ -27,7 +26,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
/** /**
* Improves JUnit5's {@link org.junit.jupiter.api.condition.DisabledOnOs} by adding an * Improves JUnit5's {@link org.junit.jupiter.api.condition.DisabledOnOs} by adding an
* architecture check and making it repeatable. * architecture check.
* *
* @author Moritz Halbritter * @author Moritz Halbritter
* @since 2.5.11 * @since 2.5.11
@ -35,7 +34,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ExtendWith(DisabledOnOsCondition.class) @ExtendWith(DisabledOnOsCondition.class)
@Repeatable(DisabledOnOsRepeatable.class)
public @interface DisabledOnOs { public @interface DisabledOnOs {
/** /**

13
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java
View File

@ -16,7 +16,7 @@
package org.springframework.boot.testsupport.junit; package org.springframework.boot.testsupport.junit;
import java.util.List; import java.util.Optional;
import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ConditionEvaluationResult;
import org.junit.jupiter.api.extension.ExecutionCondition; import org.junit.jupiter.api.extension.ExecutionCondition;
@ -32,25 +32,22 @@ class DisabledOnOsCondition implements ExecutionCondition {
@Override @Override
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
List<DisabledOnOs> annotations = AnnotationUtils.findRepeatableAnnotations(context.getElement(), Optional<DisabledOnOs> annotation = AnnotationUtils.findAnnotation(context.getElement(), DisabledOnOs.class);
DisabledOnOs.class); if (!annotation.isPresent()) {
if (annotations.isEmpty()) {
return ConditionEvaluationResult.enabled("No @DisabledOnOs found"); return ConditionEvaluationResult.enabled("No @DisabledOnOs found");
} }
return evaluate(annotations); return evaluate(annotation.get());
} }
private ConditionEvaluationResult evaluate(List<DisabledOnOs> annotations) { private ConditionEvaluationResult evaluate(DisabledOnOs annotation) {
String architecture = System.getProperty("os.arch"); String architecture = System.getProperty("os.arch");
String os = System.getProperty("os.name"); String os = System.getProperty("os.name");
for (DisabledOnOs annotation : annotations) {
if (annotation.os().isCurrentOs() && annotation.architecture().equals(architecture)) { if (annotation.os().isCurrentOs() && annotation.architecture().equals(architecture)) {
String reason = annotation.disabledReason().isEmpty() String reason = annotation.disabledReason().isEmpty()
? String.format("Disabled on OS = %s, architecture = %s", os, architecture) ? String.format("Disabled on OS = %s, architecture = %s", os, architecture)
: annotation.disabledReason(); : annotation.disabledReason();
return ConditionEvaluationResult.disabled(reason); return ConditionEvaluationResult.disabled(reason);
} }
}
return ConditionEvaluationResult return ConditionEvaluationResult
.enabled(String.format("Enabled on OS = %s, architecture = %s", os, architecture)); .enabled(String.format("Enabled on OS = %s, architecture = %s", os, architecture));
} }

39
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsRepeatable.java
View File

@ -1,39 +0,0 @@
/*
* Copyright 2012-2022 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.springframework.boot.testsupport.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.junit.jupiter.api.extension.ExtendWith;
/**
* Repeatable container for {@link DisabledOnOs}.
*
* @author Moritz Halbritter
* @since 2.5.10
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(DisabledOnOsCondition.class)
public @interface DisabledOnOsRepeatable {
DisabledOnOs[] value();
}