fixing tests

Author: Matthew Stern

.gitignore

@@ -48,5 +48,7 @@ topologicsharp/*.cs
 topologicsharp/*.c
 topologicsharp/_topologicsharp.so
 *.dll
+!.SRCINFO
+!PKGBUILD
 
 

testing/graph_vertex_edge_test.c

@@ -44,8 +44,6 @@ int testFuncEdge2(void* args, void *glbl, const void *const edge_vars){
 	return j;
 }
 
-
-
 int main(){
 	struct graph* graph = GRAPH_INIT(); //Start with basic setup; 
 	assert(graph!=NULL);
@@ -172,8 +170,8 @@ void test_graph_modify_edge(struct graph* graph){
 		assert(v!=NULL);
 		assert(v2!=NULL);
 
-		struct edge* e = (struct edge *) find(v->edge_tree, v2->id);
-		if(e->glbl) {free(e->glbl); e->glbl = NULL;}
+		//struct edge* e = (struct edge *) find(v->edge_tree, v2->id);
+		//if(e->glbl) {free(e->glbl); e->glbl = NULL;}
 		assert(modify_edge(v, v2, (testFuncEdge2), NULL)==0);
 		assert(modify_edge(v, v2, testFuncEdge, NULL)==0);
 		assert(modify_edge(NULL,v2, NULL, NULL)<0);
@@ -193,8 +191,8 @@ void test_graph_modify_bi_edge(struct graph* graph){
 		struct vertex* v2 = (struct vertex*)find(graph->vertices, ((i+1)>=TEST_SIZE ? 0 : i+1)); 
 		assert(v!=NULL);
 		assert(v2!=NULL);
-		struct edge* e = (struct edge *) find(v->edge_tree, v2->id);
-		if(e->glbl) {free(e->glbl); e->glbl = NULL;}
+		//struct edge* e = (struct edge *) find(v->edge_tree, v2->id);
+		//if(e->glbl) {free(e->glbl); e->glbl = NULL;}
 		assert(modify_bi_edge(v, v2, (testFuncEdge2), NULL)==0);
 		assert(modify_bi_edge(v, v2, testFuncEdge, NULL)==0);
 		assert(modify_bi_edge(NULL,v2, NULL, NULL)<=-1);
@@ -215,8 +213,8 @@ void test_graph_remove_bi_edge(struct graph* graph){
 		struct vertex* v2 = (struct vertex*)find(graph->vertices, ((i+1)>=TEST_SIZE ? 0 : i+1)); 
 		assert(v!=NULL);
 		assert(v2!=NULL);
-		struct edge* e = (struct edge *) find(v->edge_tree, v2->id);
-		if(e->glbl) {free(e->glbl); e->glbl = NULL;}
+		//struct edge* e = (struct edge *) find(v->edge_tree, v2->id);
+		//if(e->glbl) {free(e->glbl); e->glbl = NULL;}
 		assert(remove_bi_edge(v, v2)==0); 
 	}
 	fprintf(stderr, "BI-DIRECTIONAL EDGE REMOVAL FROM GRAPH PASSED\n");

testing/self_edge.c

@@ -25,9 +25,7 @@ void vertexFunction(struct graph *graph, struct vertex_result* args, void* glbl,
 	//return res;
 }
 
-
 int main(){
-
 	struct graph* graph;
 
 	fprintf(stderr, "SELF EDGE/LOOP TEST BEGIN\n\n");
@@ -36,8 +34,6 @@ int main(){
 	runTest(graph);
 	cleanup(graph);
 
-
-
 	return 0;
 }
 
@@ -53,10 +49,8 @@ void init(struct graph **graph)
 {
 	*graph = graph_init(100, START_STOP, 100, VERTICES | EDGES | FUNCTIONS | GLOBALS, NONE, CONTINUE);
 	assert(*graph != NULL);
-
 }
 
-
 void setupSelfEdge(struct graph* graph){
 	int i = 0;
 
@@ -104,8 +98,6 @@ void setupSelfEdge(struct graph* graph){
 
 
 void runTest(struct graph* graph){
-	assert(graph!=NULL);
-
 	assert(graph != NULL);
 
 	struct vertex_result **vertex_args = malloc(sizeof(struct vertex_result *) * ONE);

testing/switch_context_test.c

@@ -32,7 +32,6 @@ void vertexFunction(struct graph *graph, struct vertex_result* args, void* glbl,
 	//return res;
 	struct request *request = create_request(GENERIC, NULL, request_nil);
 	submit_request(graph, request);
-	
 }
 
 int main()
@@ -93,7 +92,6 @@ void init(struct graph **graph)
 	assert(*graph != NULL);
 
 	//Setting up graphs and whatnot
-	//
 	int i = 0;
 	for (i = 0; i < MAXIMUM; i++)
 	{