Skip to content

Commit b59763d

Browse files
committed
fixing #87
1 parent 43658bb commit b59763d

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

core/src/main/java/org/everit/json/schema/EnumSchema.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ public void validate(final Object subject) {
8282

8383
@Override
8484
void describePropertiesTo(final JSONPrinter writer) {
85-
writer.key("type");
86-
writer.value("enum");
8785
writer.key("enum");
8886
writer.array();
8987
possibleValues.forEach(writer::value);

core/src/test/java/org/everit/json/schema/EnumSchemaTest.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,10 @@
1515
*/
1616
package org.everit.json.schema;
1717

18-
import nl.jqno.equalsverifier.EqualsVerifier;
19-
import nl.jqno.equalsverifier.Warning;
20-
import org.everit.json.schema.internal.JSONPrinter;
21-
import org.json.JSONArray;
22-
import org.json.JSONObject;
23-
import org.junit.Before;
24-
import org.junit.Test;
18+
import static java.util.Arrays.asList;
19+
import static org.junit.Assert.assertEquals;
2520

2621
import java.io.StringWriter;
27-
import java.util.Arrays;
28-
import java.util.EnumSet;
2922
import java.util.HashMap;
3023
import java.util.HashSet;
3124
import java.util.List;
@@ -34,8 +27,14 @@
3427
import java.util.stream.Collectors;
3528
import java.util.stream.IntStream;
3629

37-
import static java.util.Arrays.asList;
38-
import static org.junit.Assert.assertEquals;
30+
import org.everit.json.schema.internal.JSONPrinter;
31+
import org.json.JSONArray;
32+
import org.json.JSONObject;
33+
import org.junit.Before;
34+
import org.junit.Test;
35+
36+
import nl.jqno.equalsverifier.EqualsVerifier;
37+
import nl.jqno.equalsverifier.Warning;
3938

4039
public class EnumSchemaTest {
4140

@@ -99,7 +98,7 @@ public void toStringTest() {
9998
subject().build().describeTo(new JSONPrinter(buffer));
10099
JSONObject actual = new JSONObject(buffer.getBuffer().toString());
101100
assertEquals(2, JSONObject.getNames(actual).length);
102-
assertEquals("enum", actual.get("type"));
101+
assertEquals(null, actual.get("type"));
103102
JSONArray pv = new JSONArray(asList(true, "foo"));
104103
assertEquals(asSet(pv), asSet(actual.getJSONArray("enum")));
105104
}

0 commit comments

Comments
 (0)