SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied changes following review

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-02-15 18:35:56 +01:00
parent a9e837ed88
commit 533e6b9ead
4 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy
View File

@@ -92,7 +92,7 @@ class SingleTestGenerator {
Class.forName(JSON_ASSERT_CLASS)
return true
} catch (ClassNotFoundException e) {
log.debug("JsonAssert is not present on classpath. Will not add a static import")
log.debug("JsonAssert is not present on classpath. Will not add a static import.")
return false
}
}

36
accurest-core/src/main/groovy/io/codearte/accurest/util/DelegatingJsonVerifiable.java
View File

@@ -32,11 +32,19 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
value.toString();
}
private void appendMethodWithValue(String methodName, Object value) {
methodsBuffer.append(".").append(methodName).append("(").append(value)
.append(")");
}
private void appendMethodWithQuotedValue(String methodName, Object value) {
appendMethodWithValue(methodName, wrapValueWithQuotes(value));
}
@Override
public MethodBufferingJsonVerifiable contains(Object value) {
DelegatingJsonVerifiable verifiable = new FinishedDelegatingJsonVerifiable(delegate.contains(value), methodsBuffer);
verifiable.methodsBuffer.append(".contains(").append(wrapValueWithQuotes(value))
.append(")");
verifiable.appendMethodWithQuotedValue("contains", value);
if (isAssertingAValueInArray()) {
verifiable.methodsBuffer.append(".value()");
}
@@ -48,11 +56,9 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
Object valueToPut = value instanceof ShouldTraverse ? ((ShouldTraverse) value).value : value;
DelegatingJsonVerifiable verifiable = new DelegatingJsonVerifiable(delegate.field(valueToPut), methodsBuffer);
if (delegate.isIteratingOverArray() && !(value instanceof ShouldTraverse)) {
verifiable.methodsBuffer.append(".contains(").append(wrapValueWithQuotes(valueToPut))
.append(")");
verifiable.appendMethodWithQuotedValue("contains", valueToPut);
} else {
verifiable.methodsBuffer.append(".field(").append(wrapValueWithQuotes(valueToPut))
.append(")");
verifiable.appendMethodWithQuotedValue("field", valueToPut);
}
return verifiable;
}
@@ -60,16 +66,14 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
@Override
public MethodBufferingJsonVerifiable array(Object value) {
DelegatingJsonVerifiable verifiable = new DelegatingJsonVerifiable(delegate.array(value), methodsBuffer);
verifiable.methodsBuffer.append(".array(").append(wrapValueWithQuotes(value))
.append(")");
verifiable.appendMethodWithQuotedValue("array", value);
return verifiable;
}
@Override
public MethodBufferingJsonVerifiable arrayField(Object value) {
DelegatingJsonVerifiable verifiable = new DelegatingJsonVerifiable(delegate.field(value).arrayField(), methodsBuffer);
verifiable.methodsBuffer.append(".array(").append(wrapValueWithQuotes(value))
.append(")");
verifiable.appendMethodWithQuotedValue("array", value);
return verifiable;
}
@@ -96,8 +100,7 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
if (delegate.isAssertingAValueInArray()) {
readyToCheck.methodsBuffer.append(".value()");
} else {
readyToCheck.methodsBuffer.append(".isEqualTo(")
.append(wrapValueWithQuotes(value)).append(")");
readyToCheck.appendMethodWithQuotedValue("isEqualTo", value);
}
return readyToCheck;
}
@@ -116,8 +119,7 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
if (delegate.isAssertingAValueInArray()) {
readyToCheck.methodsBuffer.append(".value()");
} else {
readyToCheck.methodsBuffer.append(".isEqualTo(").append(String.valueOf(value))
.append(")");
readyToCheck.appendMethodWithValue("isEqualTo", String.valueOf(value));
}
return readyToCheck;
}
@@ -135,8 +137,7 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
if (delegate.isAssertingAValueInArray()) {
readyToCheck.methodsBuffer.append(".value()");
} else {
readyToCheck.methodsBuffer.append(".matches(").append(wrapValueWithQuotes(value))
.append(")");
readyToCheck.appendMethodWithQuotedValue("matches", value);
}
return readyToCheck;
}
@@ -147,8 +148,7 @@ class DelegatingJsonVerifiable implements MethodBufferingJsonVerifiable {
if (delegate.isAssertingAValueInArray()) {
readyToCheck.methodsBuffer.append(".value()");
} else {
readyToCheck.methodsBuffer.append(".isEqualTo(").append(String.valueOf(value))
.append(")");
readyToCheck.appendMethodWithValue("isEqualTo", String.valueOf(value));
}
return readyToCheck;
}

2
accurest-core/src/main/groovy/io/codearte/accurest/util/MethodBufferingJsonVerifiable.java
View File

@@ -6,7 +6,7 @@ import com.blogspot.toomuchcoding.jsonassert.JsonVerifiable;
* @author Marcin Grzejszczak
*/
public interface MethodBufferingJsonVerifiable
extends JsonVerifiable, MethodBuffering, MethodBufferingReadyToCheck {
extends JsonVerifiable, MethodBuffering {
@Override
MethodBufferingJsonVerifiable contains(Object value);

8
accurest-core/src/main/groovy/io/codearte/accurest/util/MethodBufferingReadyToCheck.java
View File

@@ -1,8 +0,0 @@
package io.codearte.accurest.util;
/**
* @author Marcin Grzejszczak
*/
interface MethodBufferingReadyToCheck extends MethodBuffering {
}