Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-107 - Polishing test cases.

Browse Source 
Extracted DATAREST-107 specific test cases into separate test method.
This commit is contained in:
Oliver Gierke
2014-01-14 10:28:34 +01:00
parent bc30b74cbe
commit 074c77cc3e
1 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
spring-data-rest-core/src/test/java/org/springframework/data/rest/core/mapping/ResourceMappingsIntegrationTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* 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.
@@ -18,6 +18,9 @@ package org.springframework.data.rest.core.mapping;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.List;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
@@ -36,14 +39,11 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* Integration tests for {@link ResourceMappings}.
*
* @author Oliver Gierke
* @author Greg Trunquist
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = JpaRepositoryConfig.class)
@@ -63,7 +63,7 @@ public class ResourceMappingsIntegrationTest {
@Test
public void detectsAllMappings() {
assertThat(mappings, is(Matchers.<ResourceMetadata>iterableWithSize(6)));
assertThat(mappings, is(Matchers.<ResourceMetadata> iterableWithSize(6)));
}
@Test
@@ -73,15 +73,6 @@ public class ResourceMappingsIntegrationTest {
assertThat(personMappings.isExported(), is(true));
assertThat(personMappings.getSearchResourceMappings().isExported(), is(true));
// @see DATAREST-107
List<String> methodNames = new ArrayList<String>();
for (MethodResourceMapping method : personMappings.getSearchResourceMappings()) {
methodNames.add(method.getMethod().getName());
}
assertThat(methodNames.size(), equalTo(3));
assertThat(methodNames, hasItems("findByFirstName", "findByCreatedGreaterThan", "findByCreatedUsingISO8601Date"));
}
@Test
@@ -91,12 +82,6 @@ public class ResourceMappingsIntegrationTest {
assertThat(creditCardMapping.isExported(), is(false));
assertThat(creditCardMapping.getSearchResourceMappings().isExported(), is(false));
int items = 0;
for (MethodResourceMapping method : creditCardMapping.getSearchResourceMappings()) {
items++;
}
assertThat(items, equalTo(0));
}
/**
@@ -132,4 +117,26 @@ public class ResourceMappingsIntegrationTest {
assertThat(creditCardMapping.isExported(), is(false));
assertThat(mappings.exportsTopLevelResourceFor("creditCards"), is(false));
}
/**
* @see DATAREST-107
*/
@Test
public void skipsSearchMethodsNotExported() {
ResourceMetadata creditCardMetadata = mappings.getMappingFor(CreditCard.class);
SearchResourceMappings searchResourceMappings = creditCardMetadata.getSearchResourceMappings();
assertThat(searchResourceMappings, is(Matchers.<MethodResourceMapping> iterableWithSize(0)));
ResourceMetadata personMetadata = mappings.getMappingFor(Person.class);
List<String> methodNames = new ArrayList<String>();
for (MethodResourceMapping method : personMetadata.getSearchResourceMappings()) {
methodNames.add(method.getMethod().getName());
}
assertThat(methodNames, hasSize(3));
assertThat(methodNames, hasItems("findByFirstName", "findByCreatedGreaterThan", "findByCreatedUsingISO8601Date"));
}
}