using json parser from common code

Author: Damian Kowalewski

.gitignore

@@ -55,6 +55,7 @@ RemoteSystemsTempFiles/
 **/unix/src/*.lo
 **/unix/samples/simple_parse_loop/simple_parse_loop
 **/unix/samples/simple_custom_loop/simple_custom_loop
+**/unix/samples/test/parse_test
 **/unix/yun/Makefile
 **/unix/yun/Makefile.in
 **/unix/yun/parse_push

unix/samples/test/Makefile

@@ -1,7 +1,7 @@
 CC = gcc
-SRCS = main.c json.c
+SRCS = main.c simplejson.c
 OBJS = $(SRCS:.c=.o)
-INCLUDES =
+INCLUDES = -I../../../common/
 LIBDIRS =
 LIBS = -lparse
 TARGET = parse_test
@@ -11,8 +11,11 @@ all: $(TARGET)
 $(TARGET): $(OBJS)
 	$(CC) $(LIBDIRS) $(OBJS) -o $(TARGET) $(LIBS)
 
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<  -o $@
+main.o: main.c
+	$(CC) $(CFLAGS) $(INCLUDES) -c $^  -o $@
+
+simplejson.o: ../../../common/simplejson.c
+	$(CC) $(CFLAGS) $(INCLUDES) -c $^  -o $@
 
 clean:
 	rm -fR $(TARGET) $(OBJS)

unix/samples/test/json.c

@@ -26,7 +26,7 @@
 #include <parse.h>
 #include <time.h>
 
-#include "json.h"
+#include "simplejson.h"
 
 int totalTests = 0;
 int successfullTests = 0;
@@ -95,8 +95,8 @@ static void pushCallback(ParseClient client, int error, const char *buffer) {
         char id[16] = {0};
         char orig[16] = {0};
         snprintf(orig, sizeof(orig), "%ld", run);
-        if (simpleJson(buffer, "data", data, sizeof(data))) {
-            if (simpleJson(data, "id", id, sizeof(id))) {
+        if (simpleJsonProcessor(buffer, "data", data, sizeof(data))) {
+            if (simpleJsonProcessor(data, "id", id, sizeof(id))) {
                 if (strncmp(id, orig, sizeof(id)) == 0) {
                     pushCounter++;
                 }
@@ -120,7 +120,6 @@ int main(int argc, char *argv[]) {
 
 
     // TEST INITIALIZATION
-
     ParseClient client = parseInitialize(YOUR_APP_IP, YOUR_CLIENT_KEY);
     logResults(client != NULL, 1, "parseInitialize call", "failed to start parse");
 
@@ -144,7 +143,7 @@ int main(int argc, char *argv[]) {
     parseSendRequest(client, "POST", classPathOne, "{\"test\":\"object1\", \"value\":1}", callback);   
     logResults(cachedRunResult != NULL, 0, "create test object 1", "creating object failed");
     memset(objectId, 0, sizeof(objectId));
-    logResults(simpleJson(cachedRunResult, "objectId", objectId, sizeof(objectId)), 0, "object 1 created", "could not create an object");
+    logResults(simpleJsonProcessor(cachedRunResult, "objectId", objectId, sizeof(objectId)), 0, "object 1 created", "could not create an object");
 
     clearCachedResults();
 
@@ -158,7 +157,7 @@ int main(int argc, char *argv[]) {
     parseSendRequest(client, "POST", classPathOne, "{\"test\":\"object1\", \"value\":2}", callback);   
     logResults(cachedRunResult != NULL, 0, "create test object 2", "creating object failed");
     memset(objectId, 0, sizeof(objectId));
-    logResults(simpleJson(cachedRunResult, "objectId", objectId, sizeof(objectId)), 0, "object 2 created", "could not create an object");
+    logResults(simpleJsonProcessor(cachedRunResult, "objectId", objectId, sizeof(objectId)), 0, "object 2 created", "could not create an object");
 
     clearCachedResults();
 
@@ -172,7 +171,7 @@ int main(int argc, char *argv[]) {
     parseSendRequest(client, "POST", classPathOne, "{\"test\":\"object1\", \"value\":3}", callback);   
     logResults(cachedRunResult != NULL, 0, "create test object 3", "creating object failed");
     char objectIdKeepAround[11] = {0};
-    logResults(simpleJson(cachedRunResult, "objectId", objectIdKeepAround, sizeof(objectIdKeepAround)), 0, "object 3 created", "could not create an object");
+    logResults(simpleJsonProcessor(cachedRunResult, "objectId", objectIdKeepAround, sizeof(objectIdKeepAround)), 0, "object 3 created", "could not create an object");
 
     clearCachedResults();
 
@@ -186,7 +185,7 @@ int main(int argc, char *argv[]) {
     parseSendRequest(client, "POST", classPathOne, "{\"test\":\"object1\", \"value\":2}", callback);   
     logResults(cachedRunResult != NULL, 0, "create test object 4", "creating object failed");
     memset(objectId, 0, sizeof(objectId));
-    logResults(simpleJson(cachedRunResult, "objectId", objectId, sizeof(objectId)), 0, "object 4 created", "could not create an object");
+    logResults(simpleJsonProcessor(cachedRunResult, "objectId", objectId, sizeof(objectId)), 0, "object 4 created", "could not create an object");
 
     clearCachedResults();
 

unix/samples/test/json.h

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+
 COUNTER=0
 while [  $COUNTER -lt 10 ]; do
   curl -X POST \