Skip to content

Commit

Permalink
#40 any -* placeholders added
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukas-krecan
lukas-krecan committed Jun 24, 2016
1 parent 165f763 commit a311e8f
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 11 deletions.
36 changes: 31 additions & 5 deletions json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/Diff.java
View file
@@ -1,12 +1,12 @@
/**
* Copyright 2009-2015 the original author or authors.
*
* <p>
* 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.
Expand Down Expand Up @@ -205,8 +205,22 @@ private void compareNodes(Node expectedNode, Node actualNode, String fieldPath)
return;
}


// Any number
if (checkAny(NodeType.NUMBER, "${json-unit.any-number}", "a number", expectedNode, actualNode, fieldPath)) {
return;
}
// Any boolean
if (checkAny(NodeType.BOOLEAN, "${json-unit.any-boolean}", "a boolean", expectedNode, actualNode, fieldPath)) {
return;
}
// Any string
if (checkAny(NodeType.STRING, "${json-unit.any-string}", "a string", expectedNode, actualNode, fieldPath)) {
return;
}

if (!expectedNodeType.equals(actualNodeType)) {
valueDifferenceFound("Different value found in node \"%s\". Expected '%s', got '%s'.", fieldPath, expectedNode, actualNode);
valueDifferenceFound("Different value found in node \"%s\". Expected '%s', got '%s'.", fieldPath, quoteTextValue(expectedNode), quoteTextValue(actualNode));
} else {
switch (expectedNodeType) {
case OBJECT:
Expand Down Expand Up @@ -243,6 +257,18 @@ private void compareNodes(Node expectedNode, Node actualNode, String fieldPath)
}
}

private boolean checkAny(NodeType type, String placeholder, String name, Node expectedNode, Node actualNode, String fieldPath) {
if (expectedNode.getNodeType() == NodeType.STRING && placeholder.equals(expectedNode.asText())) {
if (actualNode.getNodeType() == type) {
return true;
} else {
valueDifferenceFound("Different value found in node \"%s\". Expected %s, got '%s'.", fieldPath, name, quoteTextValue(actualNode));
return true;
}
}
return false;
}

private void compareStringValues(String expectedValue, String actualValue, String path) {
if (hasOption(IGNORING_VALUES)) {
return;
Expand Down
130 changes: 124 additions & 6 deletions ...st-base/src/main/java/net/javacrumbs/jsonunit/test/base/AbstractJsonFluentAssertTest.java
View file
@@ -1,12 +1,12 @@
/**
* Copyright 2009-2015 the original author or authors.
*
* <p>
* 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.
Expand All @@ -33,12 +33,10 @@
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

public abstract class AbstractJsonFluentAssertTest {
@Test
Expand Down Expand Up @@ -287,6 +285,126 @@ public void testIgnoreDifferent() {
assertThatJson("{\"test\":1}").ignoring("##IGNORE##").isEqualTo("{\"test\":\"##IGNORE##\"}");
}

@Test
public void anyNumberShouldAcceptAnInt() {
assertThatJson("{\"test\":1}").isEqualTo("{\"test\":\"${json-unit.any-number}\"}");
}

@Test
public void anyNumberShouldAcceptAFloat() {
assertThatJson("{\"test\":1.1}").isEqualTo("{\"test\":\"${json-unit.any-number}\"}");
}

@Test
public void anyNumberShouldFailOnString() {
try {
assertThatJson("{\"test\":\"one\"}").isEqualTo("{\"test\":\"${json-unit.any-number}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a number, got '\"one\"'.\n", e.getMessage());
}
}

@Test
public void anyNumberShouldFailOnNull() {
try {
assertThatJson("{\"test\":null}").isEqualTo("{\"test\":\"${json-unit.any-number}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a number, got 'null'.\n", e.getMessage());
}
}

@Test
public void anyNumberShouldFailOnObject() {
try {
assertThatJson("{\"test\":{\"a\":1}}").isEqualTo("{\"test\":\"${json-unit.any-number}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a number, got '{\"a\":1}'.\n", e.getMessage());
}
}

@Test
public void anyBooleanShouldAcceptTrue() {
assertThatJson("{\"test\":true}").isEqualTo("{\"test\":\"${json-unit.any-boolean}\"}");
}

@Test
public void anyBooleanShouldFailOnString() {
try {
assertThatJson("{\"test\":\"true\"}").isEqualTo("{\"test\":\"${json-unit.any-boolean}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a boolean, got '\"true\"'.\n", e.getMessage());
}
}

@Test
public void anyBooleanShouldFailOnNull() {
try {
assertThatJson("{\"test\":null}").isEqualTo("{\"test\":\"${json-unit.any-boolean}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a boolean, got 'null'.\n", e.getMessage());
}
}

@Test
public void anyBooleanShouldFailOnObject() {
try {
assertThatJson("{\"test\":{\"a\":1}}").isEqualTo("{\"test\":\"${json-unit.any-boolean}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a boolean, got '{\"a\":1}'.\n", e.getMessage());
}
}

@Test
public void anyStringShouldAcceptAString() {
assertThatJson("{\"test\":\"value\"}").isEqualTo("{\"test\":\"${json-unit.any-string}\"}");
}

@Test
public void anyStringShouldFailOnBoolean() {
try {
assertThatJson("{\"test\":true}").isEqualTo("{\"test\":\"${json-unit.any-string}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a string, got 'true'.\n", e.getMessage());
}
}

@Test
public void anyStringShouldFailOnNull() {
try {
assertThatJson("{\"test\":null}").isEqualTo("{\"test\":\"${json-unit.any-string}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a string, got 'null'.\n", e.getMessage());
}
}

@Test
public void anyStringShouldFailOnObject() {
try {
assertThatJson("{\"test\":{\"a\":1}}").isEqualTo("{\"test\":\"${json-unit.any-string}\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected a string, got '{\"a\":1}'.\n", e.getMessage());
}
}

@Test
public void comparisonShouldFailOnDifferentType() {
try {
assertThatJson("{\"test\":1}").isEqualTo("{\"test\":\"1\"}");
failIfNoException();
} catch (AssertionError e) {
assertEquals("JSON documents are different:\nDifferent value found in node \"test\". Expected '\"1\"', got '1'.\n", e.getMessage());
}
}

@Test
public void testEqualsToArray() {
assertThatJson("{\"test\":[1,2,3]}").node("test").isEqualTo(new int[]{1, 2, 3});
Expand Down

0 comments on commit a311e8f

Please sign in to comment.