Merge branch 'conditional-tests' into 2.0.x

Author: nebhale

integration-test/src/test/java/org/cloudfoundry/AbstractIntegrationTest.java

@@ -48,6 +48,10 @@ public abstract class AbstractIntegrationTest {
     @Rule
     public final TestName testName = new TestName();
 
+    @Autowired
+    @Rule
+    public CloudFoundryVersionConditionalRule cloudFoundryVersion;
+
     @Autowired
     protected NameFactory nameFactory;
 

integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersionConditionalRule.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013-2016 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 com.github.zafarkhaja.semver.Version;
+import org.junit.Assume;
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import java.util.Optional;
+
+import static org.cloudfoundry.IfCloudFoundryVersion.CloudFoundryVersion.UNSPECIFIED;
+
+final class CloudFoundryVersionConditionalRule implements MethodRule {
+
+    private final Version server;
+
+    CloudFoundryVersionConditionalRule(Version server) {
+        this.server = server;
+    }
+
+    @Override
+    public Statement apply(Statement base, FrameworkMethod method, Object target) {
+        return new Statement() {
+
+            @Override
+            public void evaluate() throws Throwable {
+                boolean enabled = Optional.ofNullable(AnnotationUtils.findAnnotation(method.getMethod(), IfCloudFoundryVersion.class))
+                    .map(c -> isTestEnabled(c, CloudFoundryVersionConditionalRule.this.server))
+                    .orElse(true);
+
+                Assume.assumeTrue(String.format("Cloud Foundry version required by @IfCloudFoundryVersion is not valid for test method [%s].", method.getMethod()), enabled);
+
+                base.evaluate();
+            }
+        };
+    }
+
+    private static boolean isTestEnabled(IfCloudFoundryVersion condition, Version server) {
+        boolean enabled = true;
+
+        if (condition.lessThan() != UNSPECIFIED) {
+            enabled = enabled && server.lessThan(condition.lessThan().getVersion());
+        }
+
+        if (condition.lessThanOrEqualTo() != UNSPECIFIED) {
+            enabled = enabled && server.lessThanOrEqualTo(condition.lessThanOrEqualTo().getVersion());
+        }
+
+        if (condition.equalTo() != UNSPECIFIED) {
+            enabled = enabled && server.equals(condition.equalTo().getVersion());
+        }
+
+        if (condition.greaterThanOrEqualTo() != UNSPECIFIED) {
+            enabled = enabled && server.greaterThanOrEqualTo(condition.greaterThanOrEqualTo().getVersion());
+        }
+
+        if (condition.greaterThan() != UNSPECIFIED) {
+            enabled = enabled && server.greaterThan(condition.greaterThan().getVersion());
+        }
+
+        return enabled;
+    }
+
+}

integration-test/src/test/java/org/cloudfoundry/IfCloudFoundryVersion.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2013-2016 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 com.github.zafarkhaja.semver.Version;
+
+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 static org.cloudfoundry.IfCloudFoundryVersion.CloudFoundryVersion.UNSPECIFIED;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface IfCloudFoundryVersion {
+
+    CloudFoundryVersion equalTo() default UNSPECIFIED;
+
+    CloudFoundryVersion greaterThan() default UNSPECIFIED;
+
+    CloudFoundryVersion greaterThanOrEqualTo() default UNSPECIFIED;
+
+    CloudFoundryVersion lessThan() default UNSPECIFIED;
+
+    CloudFoundryVersion lessThanOrEqualTo() default UNSPECIFIED;
+
+    enum CloudFoundryVersion {
+
+        PCF_1_7(Version.forIntegers(2, 54, 0)),
+
+        PCF_1_8(Version.forIntegers(2, 58, 0)),
+
+        PCF_1_9(Version.forIntegers(2, 65, 0)),
+
+        UNSPECIFIED(Version.forIntegers(0));
+
+        private final Version version;
+
+        CloudFoundryVersion(Version version) {
+            this.version = version;
+        }
+
+        Version getVersion() {
+            return this.version;
+        }
+
+    }
+
+}

integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java

@@ -20,7 +20,9 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
+import com.github.zafarkhaja.semver.Version;
 import org.cloudfoundry.client.CloudFoundryClient;
+import org.cloudfoundry.client.v2.info.GetInfoRequest;
 import org.cloudfoundry.client.v2.organizations.CreateOrganizationRequest;
 import org.cloudfoundry.client.v2.spaces.CreateSpaceRequest;
 import org.cloudfoundry.client.v2.stacks.ListStacksRequest;
@@ -190,6 +192,18 @@ DefaultCloudFoundryOperations cloudFoundryOperations(CloudFoundryClient cloudFou
             .build();
     }
 
+    @Bean
+    CloudFoundryVersionConditionalRule cloudFoundryVersionConditionalRule(CloudFoundryClient cloudFoundryClient) {
+        return cloudFoundryClient.info()
+            .get(GetInfoRequest.builder()
+                .build())
+            .map(response -> Version.valueOf(response.getApiVersion()))
+            .map(CloudFoundryVersionConditionalRule::new)
+            .doOnSubscribe(s -> this.logger.debug(">> CLOUD FOUNDRY VERSION <<"))
+            .doOnSuccess(r -> this.logger.debug("<< CLOUD FOUNDRY VERSION >>"))
+            .block();
+    }
+
     @Bean
     DefaultConnectionContext connectionContext(@Value("${test.apiHost}") String apiHost,
                                                @Value("${test.proxy.host:}") String proxyHost,