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

Make it easier to provide a placeholder resolver that uses the context

Browse Source 
Closes gh-235
This commit is contained in:
Andy Wilkinson
2016-05-20 16:12:12 +02:00
parent a0f82f283b
commit 4715351cce
6 changed files with 110 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-restdocs-core/src/test/java/org/springframework/restdocs/snippet/StandardWriterResolverTests.java
View File

@@ -22,7 +22,6 @@ import org.junit.Test;
import org.springframework.restdocs.ManualRestDocumentation;
import org.springframework.restdocs.RestDocumentationContext;
import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -36,11 +35,11 @@ import static org.springframework.restdocs.templates.TemplateFormats.asciidoctor
*/
public class StandardWriterResolverTests {
private final PlaceholderResolver placeholderResolver = mock(
PlaceholderResolver.class);
private final PlaceholderResolverFactory placeholderResolverFactory = mock(
PlaceholderResolverFactory.class);
private final StandardWriterResolver resolver = new StandardWriterResolver(
this.placeholderResolver, "UTF-8", asciidoctor());
this.placeholderResolverFactory, "UTF-8", asciidoctor());
@Test
public void absoluteInput() {

4
spring-restdocs-core/src/test/java/org/springframework/restdocs/test/OperationBuilder.java
View File

@@ -39,7 +39,7 @@ import org.springframework.restdocs.operation.OperationResponse;
import org.springframework.restdocs.operation.OperationResponseFactory;
import org.springframework.restdocs.operation.Parameters;
import org.springframework.restdocs.operation.StandardOperation;
import org.springframework.restdocs.snippet.RestDocumentationContextPlaceholderResolver;
import org.springframework.restdocs.snippet.RestDocumentationContextPlaceholderResolverFactory;
import org.springframework.restdocs.snippet.StandardWriterResolver;
import org.springframework.restdocs.snippet.WriterResolver;
import org.springframework.restdocs.templates.StandardTemplateResourceResolver;
@@ -107,7 +107,7 @@ public class OperationBuilder {
this.attributes.put(RestDocumentationContext.class.getName(), context);
this.attributes.put(WriterResolver.class.getName(),
new StandardWriterResolver(
new RestDocumentationContextPlaceholderResolver(context), "UTF-8",
new RestDocumentationContextPlaceholderResolverFactory(), "UTF-8",
this.templateFormat));
return new StandardOperation(this.name,
(this.requestBuilder == null