Author: gk
Date: Fri Mar 7 10:48:12 2014
New Revision: 1575231
URL: http://svn.apache.org/r1575231
Log:
Fix and Correct Test method names, parameter names and types in comments.
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java?rev=1575231&r1=1575230&r2=1575231&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
(original)
+++
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
Fri Mar 7 10:48:12 2014
@@ -101,7 +101,7 @@ public interface JsonService {
throws Exception;
/**
- * @see #serializeOnlyFilter(Object, Class, boolean, String...).
+ * @see #serializeOnlyFilter(Object, Class, Boolean, String...).
*
* <code>refreshFilter</code> is <code>false</code>.
*/
@@ -154,7 +154,7 @@ public interface JsonService {
Class<T> filterClass, Boolean refreshFilter, String... filterAttr)
throws Exception;
/**
- * @see #serializeAllExceptFilter(Object, Class, boolean, String...)
+ * @see #serializeAllExceptFilter(Object, Class, Boolean, String...)
*
* <code>refreshFilter</code> is <code>false</code>.
*/
Modified:
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java?rev=1575231&r1=1575230&r2=1575231&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
Fri Mar 7 10:48:12 2014
@@ -94,7 +94,7 @@ public class GSONBuilderService extends
@Override
public <T> Collection<T> deSerCollection(String json, Object
collectionType,
- Class<T> arg2) throws Exception {
+ Class<T> elementType) throws Exception {
getLogger().debug("deser:" + json);
getLogger().debug("collectionType:" + collectionType);
return gson.create().fromJson(json, (Type)collectionType);
Modified:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java?rev=1575231&r1=1575230&r2=1575231&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/DefaultServiceTest.java
Fri Mar 7 10:48:12 2014
@@ -67,7 +67,7 @@ public class DefaultServiceTest extends
assertEquals("Serialization failed ", preDefinedOutput, serJson);
}
- public void testSerializeExclude00() throws Exception {
+ public void testSerializeExcludeNothing() throws Exception {
String serJson = sc.serializeAllExceptFilter(new TestClass("mytest"),
(Class) null, (String[]) null);
assertEquals(
@@ -76,6 +76,7 @@ public class DefaultServiceTest extends
serJson);
}
+ // deep exclude?!
public void testSerializeExcludeClass() throws Exception {
String serJson = sc.serializeAllExceptFilter(new TestClass("mytest"),
String.class, (String[]) null);
Modified:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java?rev=1575231&r1=1575230&r2=1575231&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
Fri Mar 7 10:48:12 2014
@@ -65,7 +65,7 @@ public class DefaultServiceTest extends
assertEquals("Serialization failed ", preDefinedOutput, serJson);
}
- public void testSerializeExclude00() throws Exception {
+ public void testSerializeExcludeNothing() throws Exception {
String serJson = sc.serializeAllExceptFilter(new TestClass("mytest"),
(Class) null, (String[]) null);
assertEquals(