You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/11/06 12:50:57 UTC
svn commit: r1712948 - in
/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json:
jcr/JsonItemWriterTest.java jcr/JsonJcrNodeTest.java util/ValidatorTest.java
Author: sseifert
Date: Fri Nov 6 11:50:56 2015
New Revision: 1712948
URL: http://svn.apache.org/viewvc?rev=1712948&view=rev
Log:
cosmetic: switch to JUnit4 test style (no functional change)
Modified:
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonItemWriterTest.java
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonJcrNodeTest.java
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/util/ValidatorTest.java
Modified: sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonItemWriterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonItemWriterTest.java?rev=1712948&r1=1712947&r2=1712948&view=diff
==============================================================================
--- sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonItemWriterTest.java (original)
+++ sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonItemWriterTest.java Fri Nov 6 11:50:56 2015
@@ -16,23 +16,25 @@
*/
package org.apache.sling.commons.json.jcr;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.StringWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
-import junit.framework.TestCase;
-
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.testing.jcr.MockNode;
import org.apache.sling.commons.testing.jcr.MockNodeIterator;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import org.junit.Test;
/** Test the JsonItemWriter */
-public class JsonItemWriterTest extends TestCase {
+public class JsonItemWriterTest {
private final JsonItemWriter writer = new JsonItemWriter(null);
@@ -42,12 +44,14 @@ public class JsonItemWriterTest extends
return sw.toString();
}
+ @Test
public void testBasicJson() throws RepositoryException, JSONException {
final Node n = new MockNode("/test");
n.setProperty("testprop", "1234");
assertEquals("{\"testprop\":\"1234\"}",getJson(n, 0));
}
+ @Test
public void testMultivalued() throws RepositoryException, JSONException {
final Node n = new MockNode("/test");
final String [] values = { "1234", "yes" };
@@ -58,6 +62,7 @@ public class JsonItemWriterTest extends
/**
* See <a href="https://issues.apache.org/jira/browse/SLING-924">SLING-924</a>
*/
+ @Test
public void testOutputIterator() throws JSONException, RepositoryException {
MockNode node1 = new MockNode("/node1");
MockNode node2 = new MockNode("/node2");
Modified: sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonJcrNodeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonJcrNodeTest.java?rev=1712948&r1=1712947&r2=1712948&view=diff
==============================================================================
--- sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonJcrNodeTest.java (original)
+++ sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/jcr/JsonJcrNodeTest.java Fri Nov 6 11:50:56 2015
@@ -16,20 +16,25 @@
*/
package org.apache.sling.commons.json.jcr;
-import junit.framework.TestCase;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.testing.jcr.MockNode;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import javax.jcr.RepositoryException;
import java.util.HashSet;
import java.util.Set;
+import javax.jcr.RepositoryException;
+
+import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.commons.testing.jcr.MockNode;
+import org.junit.Test;
+
/**
* @author vidar@idium.no
* @since Apr 17, 2009 6:57:04 PM
*/
-public class JsonJcrNodeTest extends TestCase {
+public class JsonJcrNodeTest {
+ @Test
public void testJcrJsonObject() throws RepositoryException, JSONException {
MockNode node = new MockNode("/node1");
node.setProperty("prop1", "value1");
@@ -43,5 +48,4 @@ public class JsonJcrNodeTest extends Tes
assertTrue("Did not create jcr:path", json.has("jcr:path"));
}
-
}
Modified: sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/util/ValidatorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/util/ValidatorTest.java?rev=1712948&r1=1712947&r2=1712948&view=diff
==============================================================================
--- sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/util/ValidatorTest.java (original)
+++ sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/util/ValidatorTest.java Fri Nov 6 11:50:56 2015
@@ -16,30 +16,31 @@
*/
package org.apache.sling.commons.json.util;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
import org.apache.sling.commons.json.JSONException;
+import org.junit.Test;
/**
* Test the Validator.
*/
-public class ValidatorTest extends TestCase {
+public class ValidatorTest {
- public void testSimpleJSON()
- throws JSONException {
+ @Test
+ public void testSimpleJSON() throws JSONException {
Validator.validate("");
Validator.validate("[]");
Validator.validate("{}");
}
- public void testBasicJSON()
- throws JSONException {
+ @Test
+ public void testBasicJSON() throws JSONException {
Validator.validate("[1,true,\"hallo\"]");
Validator.validate("{a:\"you\", b:2, c:true}");
}
- public void testNestedJSON()
- throws JSONException {
+ @Test
+ public void testNestedJSON() throws JSONException {
Validator.validate("[1,true,\"hallo\", {a:1}, [1,2]]");
Validator.validate("{a:\"you\", b:2, c:true, d: {d:1}, e: []}");
}
@@ -47,6 +48,7 @@ public class ValidatorTest extends TestC
/**
* These tests are supposed to fail!
*/
+ @Test
public void testTrailingChars() {
try {
Validator.validate("[1,true,\"hallo\",]");
@@ -61,4 +63,5 @@ public class ValidatorTest extends TestC
// ignore
}
}
+
}