You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/06/01 19:25:55 UTC
svn commit: r1797247 - in /sling/trunk/testing/junit/remote: pom.xml
src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTest.java
src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
Author: pauls
Date: Thu Jun 1 19:25:55 2017
New Revision: 1797247
URL: http://svn.apache.org/viewvc?rev=1797247&view=rev
Log:
SLING-6906: Handle tick escaped json.
Modified:
sling/trunk/testing/junit/remote/pom.xml
sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTest.java
sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
Modified: sling/trunk/testing/junit/remote/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote/pom.xml?rev=1797247&r1=1797246&r2=1797247&view=diff
==============================================================================
--- sling/trunk/testing/junit/remote/pom.xml (original)
+++ sling/trunk/testing/junit/remote/pom.xml Thu Jun 1 19:25:55 2017
@@ -60,6 +60,9 @@
*
</Import-Package>
<Sling-Test-Regexp>.*Test</Sling-Test-Regexp>
+ <Embed-Dependency>
+ org.apache.sling.jcr.contentparser;inline="org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.class"
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -110,5 +113,17 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.contentparser</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
Modified: sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTest.java?rev=1797247&r1=1797246&r2=1797247&view=diff
==============================================================================
--- sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTest.java (original)
+++ sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTest.java Thu Jun 1 19:25:55 2017
@@ -36,7 +36,7 @@ class SlingRemoteTest {
SlingRemoteTest(Class<?> testClass, JsonObject json) throws JsonException {
this.testClass = testClass;
- description = json.getString(DESCRIPTION);
+ description = json.containsKey(DESCRIPTION) ? json.getString(DESCRIPTION) : null;
failure = json.containsKey(FAILURE) ? json.getString(FAILURE) : null;
if (failure != null) {
trace = json.containsKey(TRACE) ? json.getString(TRACE) : null;
Modified: sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java?rev=1797247&r1=1797246&r2=1797247&view=diff
==============================================================================
--- sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java (original)
+++ sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java Thu Jun 1 19:25:55 2017
@@ -24,6 +24,7 @@ import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonObject;
+import org.apache.sling.jcr.contentparser.impl.JsonTicksConverter;
import org.apache.sling.junit.remote.httpclient.RemoteTestHttpClient;
import org.apache.sling.testing.tools.http.RequestCustomizer;
import org.apache.sling.testing.tools.http.RequestExecutor;
@@ -113,14 +114,14 @@ public class SlingRemoteTestRunner exten
"json"
);
executor.assertContentType("application/json");
- final JsonArray json = Json.createReader(new StringReader(executor.getContent())).readArray();
+ final JsonArray json = Json.createReader(new StringReader(JsonTicksConverter.tickToDoubleQuote(executor.getContent()))).readArray();
// Response contains an array of objects identified by
// their INFO_TYPE, extract the tests
// based on this vlaue
for(int i = 0 ; i < json.size(); i++) {
final JsonObject obj = json.getJsonObject(i);
- if("test".equals(obj.getString("INFO_TYPE"))) {
+ if(obj.containsKey("INFO_TYPE") && "test".equals(obj.getString("INFO_TYPE"))) {
children.add(new SlingRemoteTest(testClass, obj));
}
}