From 9d35670e77167c4becfa2af6bf5ca7f7c8b909e8 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 2 Sep 2015 08:28:05 +0200 Subject: [PATCH] #380 - Renamed *Tests classes to *Test to make sure the Maven build runs them. --- ...sts.java => JacksonSerializationTest.java} | 2 +- .../{HopUnitTests.java => HopUnitTest.java} | 2 +- ...TraversonTests.java => TraversonTest.java} | 2 +- ...a => XmlConfigurationIntegrationTest.java} | 2 +- ...sts.java => EmbeddedWrappersUnitTest.java} | 2 +- .../core/MethodParametersUnitTests.java | 65 ------------------- ...ava => TypeReferencesIntegrationTest.java} | 2 +- .../hateoas/config/application-context.xml | 2 +- 8 files changed, 7 insertions(+), 72 deletions(-) rename src/test/java/org/springframework/hateoas/alps/{JacksonSerializationTests.java => JacksonSerializationTest.java} (98%) rename src/test/java/org/springframework/hateoas/client/{HopUnitTests.java => HopUnitTest.java} (98%) rename src/test/java/org/springframework/hateoas/client/{TraversonTests.java => TraversonTest.java} (99%) rename src/test/java/org/springframework/hateoas/config/{XmlConfigurationIntegrationTests.java => XmlConfigurationIntegrationTest.java} (97%) rename src/test/java/org/springframework/hateoas/core/{EmbeddedWrappersUnitTests.java => EmbeddedWrappersUnitTest.java} (98%) delete mode 100644 src/test/java/org/springframework/hateoas/core/MethodParametersUnitTests.java rename src/test/java/org/springframework/hateoas/mvc/{TypeReferencesIntegrationTests.java => TypeReferencesIntegrationTest.java} (99%) diff --git a/src/test/java/org/springframework/hateoas/alps/JacksonSerializationTests.java b/src/test/java/org/springframework/hateoas/alps/JacksonSerializationTest.java similarity index 98% rename from src/test/java/org/springframework/hateoas/alps/JacksonSerializationTests.java rename to src/test/java/org/springframework/hateoas/alps/JacksonSerializationTest.java index 33c0d2a8..44e47a92 100644 --- a/src/test/java/org/springframework/hateoas/alps/JacksonSerializationTests.java +++ b/src/test/java/org/springframework/hateoas/alps/JacksonSerializationTest.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; * * @author Oliver Gierke */ -public class JacksonSerializationTests { +public class JacksonSerializationTest { ObjectMapper mapper; diff --git a/src/test/java/org/springframework/hateoas/client/HopUnitTests.java b/src/test/java/org/springframework/hateoas/client/HopUnitTest.java similarity index 98% rename from src/test/java/org/springframework/hateoas/client/HopUnitTests.java rename to src/test/java/org/springframework/hateoas/client/HopUnitTest.java index 8385da55..78f76d0b 100644 --- a/src/test/java/org/springframework/hateoas/client/HopUnitTests.java +++ b/src/test/java/org/springframework/hateoas/client/HopUnitTest.java @@ -29,7 +29,7 @@ import org.junit.Test; * @author Oliver Gierke * @soundtrack Dave Matthews Band - The Stone (Before These Crowded Streets) */ -public class HopUnitTests { +public class HopUnitTest { /** * @see #346 diff --git a/src/test/java/org/springframework/hateoas/client/TraversonTests.java b/src/test/java/org/springframework/hateoas/client/TraversonTest.java similarity index 99% rename from src/test/java/org/springframework/hateoas/client/TraversonTests.java rename to src/test/java/org/springframework/hateoas/client/TraversonTest.java index 7119d918..5e9b1c9b 100644 --- a/src/test/java/org/springframework/hateoas/client/TraversonTests.java +++ b/src/test/java/org/springframework/hateoas/client/TraversonTest.java @@ -55,7 +55,7 @@ import org.springframework.web.client.RestTemplate; * @author Greg Turnquist * @since 0.11 */ -public class TraversonTests { +public class TraversonTest { URI baseUri; Server server; diff --git a/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTests.java b/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java similarity index 97% rename from src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTests.java rename to src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java index 99b0b3fd..e23aca01 100644 --- a/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java @@ -30,7 +30,7 @@ import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType * * @author Oliver Gierke */ -public class XmlConfigurationIntegrationTests { +public class XmlConfigurationIntegrationTest { /** * @see #259 diff --git a/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTests.java b/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java similarity index 98% rename from src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTests.java rename to src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java index 968e1171..dc68693a 100644 --- a/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTests.java +++ b/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java @@ -28,7 +28,7 @@ import org.junit.Test; * * @author Oliver Gierke */ -public class EmbeddedWrappersUnitTests { +public class EmbeddedWrappersUnitTest { EmbeddedWrappers wrappers = new EmbeddedWrappers(false); diff --git a/src/test/java/org/springframework/hateoas/core/MethodParametersUnitTests.java b/src/test/java/org/springframework/hateoas/core/MethodParametersUnitTests.java deleted file mode 100644 index e7d1664c..00000000 --- a/src/test/java/org/springframework/hateoas/core/MethodParametersUnitTests.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2013-2014 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.hateoas.core; - -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -import java.lang.reflect.Method; -import java.util.List; - -import org.junit.Test; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.core.MethodParameter; - -/** - * Unit tests for {@link MethodParameters}. - * - * @author Oliver Gierke - */ -public class MethodParametersUnitTests { - - @Test - public void prefersAnnotatedParameterOverDiscovered() throws Exception { - - Method method = Sample.class.getMethod("method", String.class, String.class, Object.class); - MethodParameters parameters = new MethodParameters(method, new AnnotationAttribute(Qualifier.class)); - - assertThat(parameters.getParameter("param"), is(notNullValue())); - assertThat(parameters.getParameter("foo"), is(notNullValue())); - assertThat(parameters.getParameter("another"), is(nullValue())); - } - - /** - * @see #138 - */ - @Test - public void returnsParametersOfAGivenType() throws Exception { - - Method method = Sample.class.getMethod("method", String.class, String.class, Object.class); - MethodParameters methodParameters = new MethodParameters(method); - - List objectParameters = methodParameters.getParametersOfType(Object.class); - assertThat(objectParameters, hasSize(1)); - assertThat(objectParameters.get(0).getParameterIndex(), is(2)); - } - - static class Sample { - - public void method(String param, @Qualifier("foo") String another, Object object) {} - } - -} diff --git a/src/test/java/org/springframework/hateoas/mvc/TypeReferencesIntegrationTests.java b/src/test/java/org/springframework/hateoas/mvc/TypeReferencesIntegrationTest.java similarity index 99% rename from src/test/java/org/springframework/hateoas/mvc/TypeReferencesIntegrationTests.java rename to src/test/java/org/springframework/hateoas/mvc/TypeReferencesIntegrationTest.java index 4cd59890..185f05d4 100644 --- a/src/test/java/org/springframework/hateoas/mvc/TypeReferencesIntegrationTests.java +++ b/src/test/java/org/springframework/hateoas/mvc/TypeReferencesIntegrationTest.java @@ -50,7 +50,7 @@ import org.springframework.web.client.RestTemplate; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration -public class TypeReferencesIntegrationTests { +public class TypeReferencesIntegrationTest { private static final String USER = "\"firstname\" : \"Dave\", \"lastname\" : \"Matthews\""; private static final String RESOURCE = String.format("{ \"_links\" : { \"self\" : \"/resource\" }, %s }", USER); diff --git a/src/test/resources/org/springframework/hateoas/config/application-context.xml b/src/test/resources/org/springframework/hateoas/config/application-context.xml index 981c4fcc..a1755ca0 100644 --- a/src/test/resources/org/springframework/hateoas/config/application-context.xml +++ b/src/test/resources/org/springframework/hateoas/config/application-context.xml @@ -7,6 +7,6 @@ - +