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

Polishing

Browse Source
This commit is contained in:
Andy Wilkinson
2016-01-26 12:38:19 +00:00
parent 02fa42445f
commit d184425216
6 changed files with 134 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/preprocess/PrettyPrintingContentModifier.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2016 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.
@@ -98,9 +98,8 @@ public class PrettyPrintingContentModifier implements ContentModifier {
SAXParser parser = parserFactory.newSAXParser();
XMLReader xmlReader = parser.getXMLReader();
xmlReader.setErrorHandler(new SilentErrorHandler());
SAXSource xmlInput = new SAXSource(xmlReader, new InputSource(
new ByteArrayInputStream(original)));
return xmlInput;
return new SAXSource(xmlReader, new InputSource(new ByteArrayInputStream(
original)));
}
private static final class SilentErrorListener implements ErrorListener {
@@ -108,18 +107,18 @@ public class PrettyPrintingContentModifier implements ContentModifier {
@Override
public void warning(TransformerException exception)
throws TransformerException {
// Suppress
}
@Override
public void error(TransformerException exception) throws TransformerException {
// Suppress
}
@Override
public void fatalError(TransformerException exception)
throws TransformerException {
// Suppress
}
}
@@ -128,17 +127,17 @@ public class PrettyPrintingContentModifier implements ContentModifier {
@Override
public void warning(SAXParseException exception) throws SAXException {
// Suppress
}
@Override
public void error(SAXParseException exception) throws SAXException {
// Suppress
}
@Override
public void fatalError(SAXParseException exception) throws SAXException {
// Suppress
}
}
}

14
spring-restdocs-core/src/main/java/org/springframework/restdocs/snippet/RestDocumentationContextPlaceholderResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2016 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.
@@ -70,6 +70,14 @@ public class RestDocumentationContextPlaceholderResolver implements PlaceholderR
if ("step".equals(placeholderName)) {
return Integer.toString(this.context.getStepCount());
}
String converted = tryMethodNameConversion(placeholderName);
if (converted != null) {
return converted;
}
return tryClassNameConversion(placeholderName);
}
private String tryMethodNameConversion(String placeholderName) {
if ("methodName".equals(placeholderName)) {
return this.context.getTestMethodName();
}
@@ -79,6 +87,10 @@ public class RestDocumentationContextPlaceholderResolver implements PlaceholderR
if ("method_name".equals(placeholderName)) {
return camelCaseToSnakeCase(this.context.getTestMethodName());
}
return null;
}
private String tryClassNameConversion(String placeholderName) {
if ("ClassName".equals(placeholderName)) {
return this.context.getTestClass().getSimpleName();
}