1. John Marsden
  2. JSONStat

Commits

John Marsden  committed 0018789

Update

  • Participants
  • Parent commits 3b78ab3
  • Branches default

Comments (0)

Files changed (14)

File src/main/java/cc/plural/json/JSONStringParsingTest.java

View file
             long timeSum = 0;
             long parseTimeSum = 0;
             long toJSONTimeSum = 0;
-            int loopCount = 10000;
+            int loopCount = 1000000;
             for (int i = 0; i < loopCount; i++) {
                 evaluatePayload(jsonPackage, jsonResult);
                 timeSum += jsonPackage.getTotalTimeNano();

File src/main/java/cc/plural/json/JSONTest.java

View file
         this.input = input;
     }
 
-    /*
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-*/
     public JSONTestResult createRestResult() {
         return new JSONTestResult(this);
     }

File src/main/java/cc/plural/json/JSONTestResult.java

View file
  **/
 package cc.plural.json;
 
+import jsonij.json.marshal.annotation.JSONIgnore;
+
 /**
  *
  * @author jmarsden
     public void setTest(JSONTest test) {
         this.test = test;
     }
-    
+
+    @JSONIgnore
     public JSONTestSet getTestSet() {
         return testSet;
     }
 
+    @JSONIgnore
     public void setTestSet(JSONTestSet testSet) {
         this.testSet = testSet;
     }
         this.result = result;
     }
 
+    @JSONIgnore
     public String getInput() {
         return input;
     }
 
+    @JSONIgnore
     public void setInput(String input) {
         this.input = input;
     }

File src/main/java/cc/plural/json/JSONTestSet.java

View file
 import cc.plural.json.JSONTestResult.RESULT;
 import java.util.ArrayList;
 import java.util.Iterator;
+import jsonij.json.marshal.annotation.JSONIgnore;
 
 /**
  *
     public abstract String getName();
     
     public abstract String getDescription();
-    
+
+    @JSONIgnore
     public int testCount() {
         return size();
     }
                     Thread.sleep(10);
                     sleepCount += 10;
                 } catch (InterruptedException ex) {}
-                if(sleepCount > 1000000) {
+                if(sleepCount > 10) {
                     testThread.interrupt();
                     testResult.result = RESULT.HANG;
                     break;

File src/main/java/cc/plural/json/JSONTestSetResult.java

View file
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import jsonij.json.marshal.annotation.JSONIgnore;
 
 /**
  *
         this.testSet = testSet;
     }
 
+    @JSONIgnore
     public JSONLibrary getTestLibrary() {
         return testLibrary;
     }
 
+    @JSONIgnore
     public void setTestLibrary(JSONLibrary testLibrary) {
         this.testLibrary = testLibrary;
     }

File src/main/java/cc/plural/json/JSONTestSuite.java

View file
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import jsonij.json.marshal.annotation.JSONIgnore;
 
 /**
  *
         }
     }
 
+    @JSONIgnore
     public int getTestSetCount() {
         return size();
     }

File src/main/java/cc/plural/json/JSONTestSuiteResult.java

View file
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import jsonij.json.marshal.annotation.JSONIgnore;
 
 /**
  *

File src/main/java/cc/plural/json/library/ArgoLibrary.java

View file
 import cc.plural.json.JSONParseStringInputException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 
 
 

File src/main/java/cc/plural/json/library/GSONLibrary.java

View file
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.io.InputStream;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 
 /**
  *

File src/main/java/cc/plural/json/library/JSONDotOrgLibrary.java

View file
 import cc.plural.json.JSONParseStringInputException;
 import cc.plural.json.JSONStatUtils;
 import java.io.InputStream;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

File src/main/java/cc/plural/json/library/JSONSimpleLibrary.java

View file
 import cc.plural.json.JSONLibrary;
 import cc.plural.json.JSONParseStringInputException;
 import java.io.InputStream;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 import org.json.simple.*;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;

File src/main/java/cc/plural/json/library/JSONSmartLibrary.java

View file
 import cc.plural.json.JSONLibrary;
 import cc.plural.json.JSONParseStringInputException;
 import java.io.InputStream;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 import net.minidev.json.*;
 import net.minidev.json.parser.*;
 

File src/main/java/cc/plural/json/library/JSONiJLibrary.java

View file
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import jsonij.json.JSON;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 import jsonij.parser.ParserException;
 
 /**

File src/main/java/cc/plural/json/library/JacksonLibrary.java

View file
 import cc.plural.json.JSONParseStringInputException;
 import java.io.IOException;
 import java.io.InputStream;
-import jsonij.json.annotation.JSONIgnore;
+import jsonij.json.marshal.annotation.JSONIgnore;
 import org.codehaus.jackson.map.ObjectMapper;
 
 /**