From 8689c1bb5b74e581fd470cdb1c21b834e0802161 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Mon, 28 Oct 2019 15:00:54 +0100 Subject: [PATCH] DATAREST-1446 - Polishing. Test cases. Original pull request: #366. --- .../support/DefaultExcerptProjector.java | 1 + .../DefaultExcerptProjectorUnitTests.java | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjectorUnitTests.java diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java index f82adb4d1..1c57143df 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java @@ -64,6 +64,7 @@ public class DefaultExcerptProjector implements ExcerptProjector { public boolean hasExcerptProjection(Class type) { ResourceMetadata metadata = mappings.getMetadataFor(type); + return metadata == null ? false : metadata.getExcerptProjection().isPresent(); } } diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjectorUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjectorUnitTests.java new file mode 100644 index 000000000..7e8818c9a --- /dev/null +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjectorUnitTests.java @@ -0,0 +1,49 @@ +/* + * Copyright 2019 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 + * + * https://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.data.rest.webmvc.support; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import java.util.Optional; + +import org.junit.Test; +import org.springframework.data.projection.ProjectionFactory; +import org.springframework.data.rest.core.mapping.ResourceMappings; +import org.springframework.data.rest.core.mapping.ResourceMetadata; + +/** + * Unit test for {@link DefaultExcerptProjector}. + * + * @author Oliver Drotbohm + */ +public class DefaultExcerptProjectorUnitTests { + + ProjectionFactory factory = mock(ProjectionFactory.class); + ResourceMappings mappings = mock(ResourceMappings.class); + ResourceMetadata metadata = mock(ResourceMetadata.class); + + @Test // DATAREST-1446 + public void doesNotHaveExcerptProjectionIfMetadataReturnsNone() { + + when(mappings.getMetadataFor(Object.class)).thenReturn(metadata); + when(metadata.getExcerptProjection()).thenReturn(Optional.empty()); + + DefaultExcerptProjector projector = new DefaultExcerptProjector(factory, mappings); + + assertThat(projector.hasExcerptProjection(Object.class)).isFalse(); + } +}