Hi Thiago, we have/can add johnzon, can it avoid groovy-json dep?
Romain Manni-Bucau @rmannibucau http://www.tomitribe.com http://rmannibucau.wordpress.com https://github.com/rmannibucau ---------- Forwarded message ---------- From: <[email protected]> Date: 2014-10-06 18:02 GMT+02:00 Subject: svn commit: r1629690 - in /tomee/tomee/trunk/tomee/tomee-webaccess: pom.xml src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy To: [email protected] Author: tveronezi Date: Mon Oct 6 16:02:38 2014 New Revision: 1629690 URL: http://svn.apache.org/r1629690 Log: Don't fail the tests if the returning json string is not exactly the same as the expected one. The assertion should check the json content only. Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1629690&r1=1629689&r2=1629690&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original) +++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Mon Oct 6 16:02:38 2014 @@ -208,6 +208,12 @@ <artifactId>groovy-jsr223</artifactId> <version>${version.groovy}</version> </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-json</artifactId> + <version>${version.groovy}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy?rev=1629690&r1=1629689&r2=1629690&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy (original) +++ tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy Mon Oct 6 16:02:38 2014 @@ -18,6 +18,7 @@ package org.apache.tomee.webaccess.test.units +import groovy.json.JsonSlurper import org.apache.http.client.methods.HttpGet import org.apache.http.impl.client.CloseableHttpClient import org.apache.tomee.webaccess.rest.ApplicationConfig @@ -59,9 +60,13 @@ class LogTest { @Test void test() throws Exception { Utilities.withClient(deploymentURL, { CloseableHttpClient client -> - Assert.assertEquals('{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}', + def json = new JsonSlurper().parseText( Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/log/list-files"))) ) + Assert.assertEquals( + new JsonSlurper().parseText('{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}'), + json + ) Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/keep-alive"))) }) } Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy?rev=1629690&r1=1629689&r2=1629690&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy (original) +++ tomee/tomee/trunk/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/SessionTest.groovy Mon Oct 6 16:02:38 2014 @@ -18,6 +18,7 @@ package org.apache.tomee.webaccess.test.units +import groovy.json.JsonSlurper import org.apache.http.client.methods.HttpGet import org.apache.http.impl.client.CloseableHttpClient import org.apache.tomee.webaccess.rest.ApplicationConfig @@ -57,13 +58,19 @@ class SessionTest { @Test void testSessions() throws Exception { Utilities.withClient(deploymentURL, { CloseableHttpClient client -> - def content = Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/session"))) - def numberOfSessions = (content =~ /context/).count - Assert.assertEquals("Expecting 1 session. Resulting content: $content", 1, numberOfSessions) + def contentText = Utilities.getBody( + client.execute(new HttpGet("${deploymentURL.toURI()}rest/session")) + ); + def content = new JsonSlurper().parseText(contentText) + def numberOfSessions = content.context.size() + Assert.assertEquals("Expecting 1 session. Resulting content: $contentText", 1, numberOfSessions) }) Utilities.withClient(deploymentURL, { CloseableHttpClient client -> - def content = Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/session"))) - def numberOfSessions = (content =~ /context/).count + def contentText = Utilities.getBody( + client.execute(new HttpGet("${deploymentURL.toURI()}rest/session")) + ) + def content = new JsonSlurper().parseText(contentText) + def numberOfSessions = content.context.size() Assert.assertEquals("Expecting 2 sessions. Resulting content: $content", 2, numberOfSessions) }) }
