From 3068a037647960d5501e5eb1b88a11f652cebbff Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 12 Jun 2013 12:35:22 +0200 Subject: [PATCH] #86 - Fixed test names to make sure they run during build. Fixed some generics declaration to make sure code compiles on Java 6 as well. --- ...s.java => AbstractJackson2MarshallingIntegrationTest.java} | 2 +- ...tionTests.java => AbstractMarshallingIntegrationTest.java} | 2 +- .../springframework/hateoas/Jackson2LinkIntegrationTest.java | 2 +- .../hateoas/Jackson2ResourceIntegrationTest.java | 2 +- .../hateoas/Jackson2ResourceSupportIntegrationTest.java | 2 +- .../java/org/springframework/hateoas/LinkIntegrationTest.java | 2 +- .../org/springframework/hateoas/ResourceIntegrationTest.java | 2 +- .../hateoas/ResourceSupportIntegrationTest.java | 2 +- ...orsMarshallingTests.java => VndErrorsMarshallingTest.java} | 4 ++-- .../config/EnableHypermediaSupportIntegrationTest.java | 4 ++-- ...ererUnitTests.java => AbstractLinkDiscovererUnitTest.java} | 2 +- .../hateoas/core/DefaultLinkDiscovererUnitTest.java | 2 +- ...viderUnitTests.java => DelegatingRelProviderUnitTest.java} | 2 +- ...ererUnitTests.java => JsonPathLinkDiscovererUnitTest.java} | 2 +- ...dBuilderUnitTests.java => HalEmbeddedBuilderUnitTest.java} | 2 +- .../hateoas/hal/HalLinkDiscovererUnitTest.java | 4 ++-- .../hateoas/hal/Jackson1HalIntegrationTest.java | 4 ++-- .../hateoas/hal/Jackson2HalIntegrationTest.java | 4 ++-- ...yUnitTests.java => HeaderLinksResponseEntityUnitTest.java} | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) rename src/test/java/org/springframework/hateoas/{AbstractJackson2MarshallingIntegrationTests.java => AbstractJackson2MarshallingIntegrationTest.java} (99%) rename src/test/java/org/springframework/hateoas/{AbstractMarshallingIntegrationTests.java => AbstractMarshallingIntegrationTest.java} (95%) rename src/test/java/org/springframework/hateoas/{VndErrorsMarshallingTests.java => VndErrorsMarshallingTest.java} (97%) rename src/test/java/org/springframework/hateoas/core/{AbstractLinkDiscovererUnitTests.java => AbstractLinkDiscovererUnitTest.java} (97%) rename src/test/java/org/springframework/hateoas/core/{DelegatingRelProviderUnitTests.java => DelegatingRelProviderUnitTest.java} (97%) rename src/test/java/org/springframework/hateoas/core/{JsonPathLinkDiscovererUnitTests.java => JsonPathLinkDiscovererUnitTest.java} (96%) rename src/test/java/org/springframework/hateoas/hal/{HalEmbeddedBuilderUnitTests.java => HalEmbeddedBuilderUnitTest.java} (98%) rename src/test/java/org/springframework/hateoas/mvc/{HeaderLinksResponseEntityUnitTests.java => HeaderLinksResponseEntityUnitTest.java} (97%) diff --git a/src/test/java/org/springframework/hateoas/AbstractJackson2MarshallingIntegrationTests.java b/src/test/java/org/springframework/hateoas/AbstractJackson2MarshallingIntegrationTest.java similarity index 99% rename from src/test/java/org/springframework/hateoas/AbstractJackson2MarshallingIntegrationTests.java rename to src/test/java/org/springframework/hateoas/AbstractJackson2MarshallingIntegrationTest.java index bfb91d41..df0133d6 100644 --- a/src/test/java/org/springframework/hateoas/AbstractJackson2MarshallingIntegrationTests.java +++ b/src/test/java/org/springframework/hateoas/AbstractJackson2MarshallingIntegrationTest.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Oliver Gierke * @author Jon Brisbin */ -public abstract class AbstractJackson2MarshallingIntegrationTests { +public abstract class AbstractJackson2MarshallingIntegrationTest { protected ObjectMapper mapper; diff --git a/src/test/java/org/springframework/hateoas/AbstractMarshallingIntegrationTests.java b/src/test/java/org/springframework/hateoas/AbstractMarshallingIntegrationTest.java similarity index 95% rename from src/test/java/org/springframework/hateoas/AbstractMarshallingIntegrationTests.java rename to src/test/java/org/springframework/hateoas/AbstractMarshallingIntegrationTest.java index da661b0e..b04a1141 100644 --- a/src/test/java/org/springframework/hateoas/AbstractMarshallingIntegrationTests.java +++ b/src/test/java/org/springframework/hateoas/AbstractMarshallingIntegrationTest.java @@ -26,7 +26,7 @@ import org.junit.Before; * * @author Oliver Gierke */ -public abstract class AbstractMarshallingIntegrationTests { +public abstract class AbstractMarshallingIntegrationTest { protected ObjectMapper mapper; diff --git a/src/test/java/org/springframework/hateoas/Jackson2LinkIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2LinkIntegrationTest.java index 4868d47f..bcf5111f 100644 --- a/src/test/java/org/springframework/hateoas/Jackson2LinkIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2LinkIntegrationTest.java @@ -26,7 +26,7 @@ import org.junit.Test; * @author Oliver Gierke * @author Jon Brisbin */ -public class Jackson2LinkIntegrationTest extends AbstractJackson2MarshallingIntegrationTests { +public class Jackson2LinkIntegrationTest extends AbstractJackson2MarshallingIntegrationTest { private static final String REFERENCE = "{\"rel\":\"something\",\"href\":\"location\"}"; diff --git a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java index a4d4b685..e72d84f6 100644 --- a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; * @author Oliver Gierke * @author Jon Brisbin */ -public class Jackson2ResourceIntegrationTest extends AbstractJackson2MarshallingIntegrationTests { +public class Jackson2ResourceIntegrationTest extends AbstractJackson2MarshallingIntegrationTest { static final String REFERENCE = "{\"links\":[{\"rel\":\"self\",\"href\":\"localhost\"}],\"firstname\":\"Dave\",\"lastname\":\"Matthews\"}"; diff --git a/src/test/java/org/springframework/hateoas/Jackson2ResourceSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2ResourceSupportIntegrationTest.java index a72f9142..f9607dbf 100644 --- a/src/test/java/org/springframework/hateoas/Jackson2ResourceSupportIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2ResourceSupportIntegrationTest.java @@ -25,7 +25,7 @@ import org.junit.Test; * * @author Oliver Gierke */ -public class Jackson2ResourceSupportIntegrationTest extends AbstractJackson2MarshallingIntegrationTests { +public class Jackson2ResourceSupportIntegrationTest extends AbstractJackson2MarshallingIntegrationTest { static final String REFERENCE = "{\"links\":[{\"rel\":\"self\",\"href\":\"localhost\"}]}"; diff --git a/src/test/java/org/springframework/hateoas/LinkIntegrationTest.java b/src/test/java/org/springframework/hateoas/LinkIntegrationTest.java index 6e339906..7f2409a4 100644 --- a/src/test/java/org/springframework/hateoas/LinkIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/LinkIntegrationTest.java @@ -25,7 +25,7 @@ import org.junit.Test; * * @author Oliver Gierke */ -public class LinkIntegrationTest extends AbstractMarshallingIntegrationTests { +public class LinkIntegrationTest extends AbstractMarshallingIntegrationTest { private static final String REFERENCE = "{\"rel\":\"something\",\"href\":\"location\"}"; diff --git a/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java b/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java index 600f959d..001c366c 100644 --- a/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java @@ -27,7 +27,7 @@ import org.junit.Test; * * @author Oliver Gierke */ -public class ResourceIntegrationTest extends AbstractMarshallingIntegrationTests { +public class ResourceIntegrationTest extends AbstractMarshallingIntegrationTest { static final String REFERENCE = "{\"links\":[{\"rel\":\"self\",\"href\":\"localhost\"}],\"firstname\":\"Dave\",\"lastname\":\"Matthews\"}"; diff --git a/src/test/java/org/springframework/hateoas/ResourceSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/ResourceSupportIntegrationTest.java index 306fd01e..9f6fdb3b 100644 --- a/src/test/java/org/springframework/hateoas/ResourceSupportIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/ResourceSupportIntegrationTest.java @@ -25,7 +25,7 @@ import org.junit.Test; * * @author Oliver Gierke */ -public class ResourceSupportIntegrationTest extends AbstractMarshallingIntegrationTests { +public class ResourceSupportIntegrationTest extends AbstractMarshallingIntegrationTest { static final String REFERENCE = "{\"links\":[{\"rel\":\"self\",\"href\":\"localhost\"}]}"; diff --git a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTests.java b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java similarity index 97% rename from src/test/java/org/springframework/hateoas/VndErrorsMarshallingTests.java rename to src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java index 9c119a2b..38bc68c9 100644 --- a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTests.java +++ b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java @@ -45,7 +45,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; * * @author Oliver Gierke */ -public class VndErrorsMarshallingTests { +public class VndErrorsMarshallingTest { ObjectMapper jackson1Mapper; com.fasterxml.jackson.databind.ObjectMapper jackson2Mapper; @@ -55,7 +55,7 @@ public class VndErrorsMarshallingTests { String jsonReference; String xmlReference; - public VndErrorsMarshallingTests() throws IOException { + public VndErrorsMarshallingTest() throws IOException { jsonReference = readFile(new ClassPathResource("vnderror.json")); xmlReference = readFile(new ClassPathResource("vnderror.xml")); diff --git a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java index 27400cae..d857b264 100644 --- a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java @@ -77,13 +77,13 @@ public class EnableHypermediaSupportIntegrationTest { private static void assertEntityLinksSetUp(ApplicationContext context) { Map discoverers = context.getBeansOfType(EntityLinks.class); - assertThat(discoverers.values(), hasItem(Matchers. instanceOf(DelegatingEntityLinks.class))); + assertThat(discoverers.values(), Matchers. hasItem(instanceOf(DelegatingEntityLinks.class))); } private static void assertRelProvidersSetUp(ApplicationContext context) { Map discoverers = context.getBeansOfType(RelProvider.class); - assertThat(discoverers.values(), hasItem(Matchers. instanceOf(DelegatingRelProvider.class))); + assertThat(discoverers.values(), Matchers. hasItem(instanceOf(DelegatingRelProvider.class))); } @Configuration diff --git a/src/test/java/org/springframework/hateoas/core/AbstractLinkDiscovererUnitTests.java b/src/test/java/org/springframework/hateoas/core/AbstractLinkDiscovererUnitTest.java similarity index 97% rename from src/test/java/org/springframework/hateoas/core/AbstractLinkDiscovererUnitTests.java rename to src/test/java/org/springframework/hateoas/core/AbstractLinkDiscovererUnitTest.java index a8763d97..59401e68 100644 --- a/src/test/java/org/springframework/hateoas/core/AbstractLinkDiscovererUnitTests.java +++ b/src/test/java/org/springframework/hateoas/core/AbstractLinkDiscovererUnitTest.java @@ -31,7 +31,7 @@ import org.springframework.hateoas.LinkDiscoverer; * * @author Oliver Gierke */ -public abstract class AbstractLinkDiscovererUnitTests { +public abstract class AbstractLinkDiscovererUnitTest { @Test public void findsSingleLink() { diff --git a/src/test/java/org/springframework/hateoas/core/DefaultLinkDiscovererUnitTest.java b/src/test/java/org/springframework/hateoas/core/DefaultLinkDiscovererUnitTest.java index 1260b568..e90dadb0 100644 --- a/src/test/java/org/springframework/hateoas/core/DefaultLinkDiscovererUnitTest.java +++ b/src/test/java/org/springframework/hateoas/core/DefaultLinkDiscovererUnitTest.java @@ -22,7 +22,7 @@ import org.springframework.hateoas.LinkDiscoverer; * * @author Oliver Gierke */ -public class DefaultLinkDiscovererUnitTest extends AbstractLinkDiscovererUnitTests { +public class DefaultLinkDiscovererUnitTest extends AbstractLinkDiscovererUnitTest { static final String SAMPLE = "{ links : [ " + // "{ rel : 'self', href : 'selfHref' }, " + // diff --git a/src/test/java/org/springframework/hateoas/core/DelegatingRelProviderUnitTests.java b/src/test/java/org/springframework/hateoas/core/DelegatingRelProviderUnitTest.java similarity index 97% rename from src/test/java/org/springframework/hateoas/core/DelegatingRelProviderUnitTests.java rename to src/test/java/org/springframework/hateoas/core/DelegatingRelProviderUnitTest.java index 8f2e62e3..3e361459 100644 --- a/src/test/java/org/springframework/hateoas/core/DelegatingRelProviderUnitTests.java +++ b/src/test/java/org/springframework/hateoas/core/DelegatingRelProviderUnitTest.java @@ -29,7 +29,7 @@ import org.springframework.plugin.core.PluginRegistry; /** * @author Oliver Gierke */ -public class DelegatingRelProviderUnitTests { +public class DelegatingRelProviderUnitTest { @Test public void foo() { diff --git a/src/test/java/org/springframework/hateoas/core/JsonPathLinkDiscovererUnitTests.java b/src/test/java/org/springframework/hateoas/core/JsonPathLinkDiscovererUnitTest.java similarity index 96% rename from src/test/java/org/springframework/hateoas/core/JsonPathLinkDiscovererUnitTests.java rename to src/test/java/org/springframework/hateoas/core/JsonPathLinkDiscovererUnitTest.java index dfda42e9..bd036955 100644 --- a/src/test/java/org/springframework/hateoas/core/JsonPathLinkDiscovererUnitTests.java +++ b/src/test/java/org/springframework/hateoas/core/JsonPathLinkDiscovererUnitTest.java @@ -22,7 +22,7 @@ import org.junit.Test; * * @author Oliver Gierke */ -public class JsonPathLinkDiscovererUnitTests { +public class JsonPathLinkDiscovererUnitTest { @Test(expected = IllegalArgumentException.class) public void rejectsNullPattern() { diff --git a/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTests.java b/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java similarity index 98% rename from src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTests.java rename to src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java index fc3c12d1..7371fa4f 100644 --- a/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTests.java +++ b/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java @@ -35,7 +35,7 @@ import org.springframework.hateoas.core.EvoInflectorRelProvider; * @author Oliver Gierke * @author Dietrich Schulten */ -public class HalEmbeddedBuilderUnitTests { +public class HalEmbeddedBuilderUnitTest { RelProvider provider; diff --git a/src/test/java/org/springframework/hateoas/hal/HalLinkDiscovererUnitTest.java b/src/test/java/org/springframework/hateoas/hal/HalLinkDiscovererUnitTest.java index 2a1ea0ad..4bb01c7b 100644 --- a/src/test/java/org/springframework/hateoas/hal/HalLinkDiscovererUnitTest.java +++ b/src/test/java/org/springframework/hateoas/hal/HalLinkDiscovererUnitTest.java @@ -16,14 +16,14 @@ package org.springframework.hateoas.hal; import org.springframework.hateoas.LinkDiscoverer; -import org.springframework.hateoas.core.AbstractLinkDiscovererUnitTests; +import org.springframework.hateoas.core.AbstractLinkDiscovererUnitTest; /** * Unit tests for {@link HalLinkDiscoverer}. * * @author Oliver Gierke */ -public class HalLinkDiscovererUnitTest extends AbstractLinkDiscovererUnitTests { +public class HalLinkDiscovererUnitTest extends AbstractLinkDiscovererUnitTest { static final LinkDiscoverer discoverer = new HalLinkDiscoverer(); static final String SAMPLE = "{ _links : { " + // diff --git a/src/test/java/org/springframework/hateoas/hal/Jackson1HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/Jackson1HalIntegrationTest.java index 6bd6edf7..d4d4613f 100644 --- a/src/test/java/org/springframework/hateoas/hal/Jackson1HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/Jackson1HalIntegrationTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.hateoas.AbstractMarshallingIntegrationTests; +import org.springframework.hateoas.AbstractMarshallingIntegrationTest; import org.springframework.hateoas.Link; import org.springframework.hateoas.Links; import org.springframework.hateoas.PagedResources; @@ -40,7 +40,7 @@ import org.springframework.hateoas.hal.Jackson1HalModule.HalHandlerInstantiator; * @author Alexander Baetz * @author Oliver Gierke */ -public class Jackson1HalIntegrationTest extends AbstractMarshallingIntegrationTests { +public class Jackson1HalIntegrationTest extends AbstractMarshallingIntegrationTest { static final String SINGLE_LINK_REFERENCE = "{\"_links\":{\"self\":{\"href\":\"localhost\"}}}"; static final String LIST_LINK_REFERENCE = "{\"_links\":{\"self\":[{\"href\":\"localhost\"},{\"href\":\"localhost2\"}]}}"; diff --git a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java index b9213cef..d074b2f8 100644 --- a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.hateoas.AbstractJackson2MarshallingIntegrationTests; +import org.springframework.hateoas.AbstractJackson2MarshallingIntegrationTest; import org.springframework.hateoas.Link; import org.springframework.hateoas.Links; import org.springframework.hateoas.PagedResources; @@ -40,7 +40,7 @@ import org.springframework.hateoas.hal.Jackson2HalModule.HalHandlerInstantiator; * @author Alexander Baetz * @author Oliver Gierke */ -public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingIntegrationTests { +public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingIntegrationTest { static final String SINGLE_LINK_REFERENCE = "{\"_links\":{\"self\":{\"href\":\"localhost\"}}}"; static final String LIST_LINK_REFERENCE = "{\"_links\":{\"self\":[{\"href\":\"localhost\"},{\"href\":\"localhost2\"}]}}"; diff --git a/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTests.java b/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java similarity index 97% rename from src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTests.java rename to src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java index 43b2fea6..3e10f82d 100644 --- a/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTests.java +++ b/src/test/java/org/springframework/hateoas/mvc/HeaderLinksResponseEntityUnitTest.java @@ -33,7 +33,7 @@ import org.springframework.http.ResponseEntity; * * @author Oliver Gierke */ -public class HeaderLinksResponseEntityUnitTests { +public class HeaderLinksResponseEntityUnitTest { static final Object CONTENT = new Object(); static final Link LINK = new Link("href", "rel");