From f5cc92f33ceaa24ae8ab150a6e9acd06d56dc7fb Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 1 Jun 2015 13:36:56 -0600 Subject: [PATCH] remove s-c-consul-tests --- pom.xml | 1 - spring-cloud-consul-tests/pom.xml | 50 --------------- spring-cloud-consul-tests/run-server.sh | 1 - .../consul/sidecar/ZuulApplicationTests.java | 61 ------------------- .../src/test/resources/application.yml | 21 ------- .../src/test/resources/bootstrap.yml | 7 --- .../src/test/resources/health.json | 1 - 7 files changed, 142 deletions(-) delete mode 100644 spring-cloud-consul-tests/pom.xml delete mode 100755 spring-cloud-consul-tests/run-server.sh delete mode 100644 spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java delete mode 100644 spring-cloud-consul-tests/src/test/resources/application.yml delete mode 100644 spring-cloud-consul-tests/src/test/resources/bootstrap.yml delete mode 100644 spring-cloud-consul-tests/src/test/resources/health.json diff --git a/pom.xml b/pom.xml index 2cec6795..966539dc 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,6 @@ spring-cloud-consul-bus spring-cloud-consul-ui spring-cloud-consul-sample - spring-cloud-consul-tests spring-cloud-starter-consul-bus spring-cloud-starter-consul-config spring-cloud-starter-consul-discovery diff --git a/spring-cloud-consul-tests/pom.xml b/spring-cloud-consul-tests/pom.xml deleted file mode 100644 index 13f9e267..00000000 --- a/spring-cloud-consul-tests/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - - spring-cloud-consul-tests - jar - Spring Cloud Consul Tests - Spring Cloud Consul Tests - - - org.springframework.cloud - spring-cloud-consul - 1.0.0.BUILD-SNAPSHOT - .. - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.cloud - spring-cloud-consul-config - - - org.springframework.cloud - spring-cloud-consul-discovery - - - org.projectlombok - lombok - - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - - - diff --git a/spring-cloud-consul-tests/run-server.sh b/spring-cloud-consul-tests/run-server.sh deleted file mode 100755 index 8bacc042..00000000 --- a/spring-cloud-consul-tests/run-server.sh +++ /dev/null @@ -1 +0,0 @@ -python -m SimpleHTTPServer diff --git a/spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java b/spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java deleted file mode 100644 index 9662404d..00000000 --- a/spring-cloud-consul-tests/src/test/java/org/springframework/cloud/consul/sidecar/ZuulApplicationTests.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2013-2015 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.springframework.cloud.consul.sidecar; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.netflix.zuul.EnableZuulProxy; -import org.springframework.context.annotation.Bean; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = ZuulApplicationTests.ZuulApplication.class) -@IntegrationTest("server.port=0") -@WebAppConfiguration -public class ZuulApplicationTests { - - @Test - @Ignore - public void contextLoads() { - } - - @SpringBootApplication - @EnableCircuitBreaker - @EnableDiscoveryClient - @EnableZuulProxy - public static class ZuulApplication { - - @Bean - public InMemoryMetricRepository inMemoryMetricRepository() { - return new InMemoryMetricRepository(); - } - - public static void main(String[] args) { - SpringApplication.run(ZuulApplication.class, args); - } - - } -} diff --git a/spring-cloud-consul-tests/src/test/resources/application.yml b/spring-cloud-consul-tests/src/test/resources/application.yml deleted file mode 100644 index ce295c8c..00000000 --- a/spring-cloud-consul-tests/src/test/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -server: - port: 5678 -spring: - application: - name: sidecarTest - -sidecar: - port: 8000 - health-uri: http://localhost:8000/src/test/resources/health.json - -ribbon: - ServerListRefreshInterval: 5000 - -endpoints: - refresh: - enabled: true - shutdown: - enabled: true - health: - sensitive: false - diff --git a/spring-cloud-consul-tests/src/test/resources/bootstrap.yml b/spring-cloud-consul-tests/src/test/resources/bootstrap.yml deleted file mode 100644 index bbd58928..00000000 --- a/spring-cloud-consul-tests/src/test/resources/bootstrap.yml +++ /dev/null @@ -1,7 +0,0 @@ -spring: - #application: - # name: sideCarTest - cloud: - config: - username: user - password: password diff --git a/spring-cloud-consul-tests/src/test/resources/health.json b/spring-cloud-consul-tests/src/test/resources/health.json deleted file mode 100644 index 41f3615e..00000000 --- a/spring-cloud-consul-tests/src/test/resources/health.json +++ /dev/null @@ -1 +0,0 @@ -{"status":"UP"} \ No newline at end of file