Support skipping integration tests for unavailable CF features via environment variables #1346
+569
−44
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
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
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
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,74 @@ | ||
| /* | ||
| * Copyright 2026 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 | ||
| * | ||
| * http://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.cloudfoundry; | ||
|
|
||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Inherited; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
| import org.junit.jupiter.api.extension.ConditionEvaluationResult; | ||
| import org.junit.jupiter.api.extension.ExecutionCondition; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.api.extension.ExtensionContext; | ||
|
|
||
| /** | ||
| * Annotation to mark tests that require browser-based authentication (e.g., OAuth | ||
| * authorization code grants, implicit grants). Tests annotated with this will be skipped | ||
| * if the environment variable {@code SKIP_BROWSER_AUTH_TESTS} is set to "true". | ||
| * | ||
| * <p>Usage: | ||
| * <pre> | ||
| * @RequiresBrowserAuth | ||
| * public class MyAuthTest extends AbstractIntegrationTest { | ||
| * // ... | ||
| * } | ||
| * </pre> | ||
| * | ||
| * <p>To skip browser auth tests, set the environment variable: | ||
| * <pre> | ||
| * export SKIP_BROWSER_AUTH_TESTS=true | ||
| * </pre> | ||
| */ | ||
| @Target({ElementType.METHOD, ElementType.TYPE}) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Documented | ||
| @Inherited | ||
| @ExtendWith(RequiresBrowserAuth.BrowserAuthCondition.class) | ||
| public @interface RequiresBrowserAuth { | ||
|
|
||
| /** | ||
| * JUnit 5 ExecutionCondition that checks if Browser Auth tests should be skipped. | ||
| */ | ||
| class BrowserAuthCondition implements ExecutionCondition { | ||
|
|
||
| private static final String SKIP_BROWSER_AUTH_ENV = "SKIP_BROWSER_AUTH_TESTS"; | ||
|
|
||
| @Override | ||
| public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { | ||
| if ("true".equalsIgnoreCase(System.getenv(SKIP_BROWSER_AUTH_ENV))) { | ||
| return ConditionEvaluationResult.disabled( | ||
| "Tests requiring Browser Authentication are disabled via " | ||
| + SKIP_BROWSER_AUTH_ENV | ||
| + " environment variable"); | ||
| } | ||
|
|
||
| return ConditionEvaluationResult.enabled("Browser authentication tests are enabled"); | ||
| } | ||
| } | ||
| } |
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,74 @@ | ||
| /* | ||
| * Copyright 2026 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 | ||
| * | ||
| * http://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.cloudfoundry; | ||
|
|
||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Inherited; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
| import org.junit.jupiter.api.extension.ConditionEvaluationResult; | ||
| import org.junit.jupiter.api.extension.ExecutionCondition; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.api.extension.ExtensionContext; | ||
|
|
||
| /** | ||
| * Annotation to mark tests that require the Metric Registrar service to be available. | ||
| * Tests annotated with this will be skipped if the environment variable | ||
| * {@code SKIP_METRIC_REGISTRAR_TESTS} is set to "true". | ||
| * | ||
| * <p>Usage: | ||
| * <pre> | ||
| * @RequiresMetricRegistrar | ||
| * public class MetricTest extends AbstractIntegrationTest { | ||
| * // ... | ||
| * } | ||
| * </pre> | ||
| * | ||
| * <p>To skip metric registrar tests, set the environment variable: | ||
| * <pre> | ||
| * export SKIP_METRIC_REGISTRAR_TESTS=true | ||
| * </pre> | ||
| */ | ||
| @Target({ElementType.METHOD, ElementType.TYPE}) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Documented | ||
| @Inherited | ||
| @ExtendWith(RequiresMetricRegistrar.RegistrarCondition.class) | ||
| public @interface RequiresMetricRegistrar { | ||
|
|
||
| /** | ||
| * JUnit 5 ExecutionCondition that checks if Metric Registrar tests should be skipped. | ||
| */ | ||
| class RegistrarCondition implements ExecutionCondition { | ||
|
|
||
| private static final String SKIP_REGISTRAR_ENV = "SKIP_METRIC_REGISTRAR_TESTS"; | ||
|
|
||
| @Override | ||
| public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { | ||
| if ("true".equalsIgnoreCase(System.getenv(SKIP_REGISTRAR_ENV))) { | ||
| return ConditionEvaluationResult.disabled( | ||
| "Tests requiring Metric Registrar Service are disabled via " | ||
| + SKIP_REGISTRAR_ENV | ||
| + " environment variable."); | ||
| } | ||
|
|
||
| return ConditionEvaluationResult.enabled("Metric Registrar tests are enabled"); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
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.
Is this really about "non-interactive" environments? Do we support interactive environments in our tests? Or is it about some UAA configuration that has browser-based auth?