From e4e29e131615e7aa141cc386414bb128168dfff5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 4 Aug 2017 14:37:24 -0600 Subject: [PATCH] Move tests out of default and base package --- .../ApacheHttpClientConfigurationTests.java | 27 ++++++++--------- .../test}/OkHttpClientConfigurationTests.java | 30 +++++++++---------- 2 files changed, 28 insertions(+), 29 deletions(-) rename spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/{ => test}/ApacheHttpClientConfigurationTests.java (91%) rename spring-cloud-netflix-core/src/test/java/{ => org/springframework/cloud/netflix/test}/OkHttpClientConfigurationTests.java (88%) diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ApacheHttpClientConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java similarity index 91% rename from spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ApacheHttpClientConfigurationTests.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java index dc27ce47..82ef658e 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ApacheHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java @@ -1,22 +1,21 @@ /* + * Copyright 2013-2017 the original author or authors. * - * * 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. + * 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.netflix; +package org.springframework.cloud.netflix.test; import feign.Client; import feign.httpclient.ApacheHttpClient; diff --git a/spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java similarity index 88% rename from spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java index e9d58e06..a75f24e3 100644 --- a/spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java @@ -1,21 +1,22 @@ /* + * Copyright 2013-2017 the original author or authors. * - * * 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. + * 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.netflix.test; + import feign.Client; import okhttp3.ConnectionPool; import okhttp3.OkHttpClient; @@ -23,8 +24,7 @@ import okhttp3.OkHttpClient; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.X509TrustManager; + import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith;