Skip to content

Commit 3d9ba15

Browse files
jbescoslukasj
authored andcommitted
TCK: JsonParser needs to have a way to get current event #316
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
1 parent b066df0 commit 3d9ba15

File tree

1 file changed

+39
-8
lines changed
  • tck/tck-tests/src/main/java/jakarta/jsonp/tck/api/jsonparsertests

1 file changed

+39
-8
lines changed

tck/tck-tests/src/main/java/jakarta/jsonp/tck/api/jsonparsertests/ClientTests.java

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,14 +19,15 @@
1919
*/
2020
package jakarta.jsonp.tck.api.jsonparsertests;
2121

22-
import jakarta.jsonp.tck.api.common.TestResult;
23-
import jakarta.jsonp.tck.common.*;
24-
import jakarta.jsonp.tck.lib.harness.Fault;
22+
import static jakarta.jsonp.tck.api.common.JsonAssert.valueToString;
23+
import static org.junit.Assert.assertEquals;
24+
import static org.junit.Assert.assertNotNull;
25+
import static org.junit.Assert.assertNull;
2526

26-
import java.io.*;
27+
import java.io.InputStream;
28+
import java.io.StringReader;
2729
import java.math.BigDecimal;
2830
import java.util.NoSuchElementException;
29-
import java.util.Properties;
3031

3132
import org.jboss.arquillian.container.test.api.Deployment;
3233
import org.jboss.arquillian.junit.Arquillian;
@@ -35,8 +36,18 @@
3536
import org.junit.Test;
3637
import org.junit.runner.RunWith;
3738

38-
import jakarta.json.*;
39-
import jakarta.json.stream.*;
39+
import jakarta.json.Json;
40+
import jakarta.json.JsonArray;
41+
import jakarta.json.JsonException;
42+
import jakarta.json.JsonObject;
43+
import jakarta.json.stream.JsonParser;
44+
import jakarta.json.stream.JsonParser.Event;
45+
import jakarta.json.stream.JsonParsingException;
46+
import jakarta.jsonp.tck.api.common.TestResult;
47+
import jakarta.jsonp.tck.common.JSONP_Data;
48+
import jakarta.jsonp.tck.common.JSONP_Util;
49+
import jakarta.jsonp.tck.common.MyBufferedInputStream;
50+
import jakarta.jsonp.tck.lib.harness.Fault;
4051

4152
@RunWith(Arquillian.class)
4253
public class ClientTests {
@@ -1905,4 +1916,24 @@ public void jsonParser11Test() throws Fault {
19051916
result.eval();
19061917
}
19071918

1919+
/*
1920+
* @testName: jsonParserCurrentEvent
1921+
*
1922+
* @test_Strategy: Tests JsonParser API methods added in JSON-P 2.1.
1923+
*/
1924+
@Test
1925+
public void jsonParserCurrentEvent() {
1926+
try (JsonParser parser = Json.createParser(new StringReader("{\"a\":\"v\",\"b\":\"w\"}"))) {
1927+
assertNull(parser.currentEvent());
1928+
int events = 0;
1929+
while (parser.hasNext()) {
1930+
Event next = parser.next();
1931+
assertNotNull(next);
1932+
assertEquals(next, parser.currentEvent());
1933+
assertEquals(parser.currentEvent(), parser.currentEvent());
1934+
events++;
1935+
}
1936+
assertEquals(6, events);
1937+
}
1938+
}
19081939
}

0 commit comments

Comments
 (0)