Commit88d6e72

committed

Move existing wrappers tests to TAP tests

1 parent079fe9a commit88d6e72Copy full SHA for 88d6e72

File tree

+59

-37

lines changed

+59

-37

lines changed

Lines changed: 4 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,41 +12,31 @@ blobstamper/stamp.o \`
`12`	`12`	`blobstamper/stamp_atomic.o\`
`13`	`13`	`blobstamper/stamp_pg_type_geo.o\`
`14`	`14`
	`15`	`+WRAPPERS_OBJ = pg_op_wrappers.o`
`15`	`16`
`16`	`17`
`17`		`-.PHONY: all`
`18`		`-all: blob-stamper-alltest test_pg_op_wrappers`
	`18`	`+.PHONY: all blob-stamper-all blob-stamper-clean clean test`
	`19`	`+all: blob-stamper-all$(WRAPPERS_OBJ)`
`19`	`20`	`@echo All done!`
`20`	`21`
`21`		`-.PHONY: blob-stamper-all`
`22`	`22`	`blob-stamper-all:`
`23`	`23`	`$(MAKE) -C blobstamper`
`24`	`24`
`25`		`-test_pg_op_wrappers: blob-stamper-all$(LIB_OBJS) test_pg_op_wrappers.o pg_op_wrappers.o`
`26`		`-$(CXX)$(LDFLAGS)$@.o -o$@$(LDLIBS)$(BLOB_STAMPER_OBJ) pg_op_wrappers.o`
`27`		`-`
`28`	`25`	`%.o:%.cpp$(DEPS)`
`29`	`26`	`$(CXX) -c -g$(CFLAGS)$<`
`30`	`27`
`31`	`28`	`%.o:%.c$(DEPS)`
`32`	`29`	`$(CC) -c -g$(CXXFLAGS)$<`
`33`	`30`
`34`		`-.PHONY: blob-stamper-clean`
`35`		`-`
`36`	`31`	`blob-stamper-clean:`
`37`	`32`	`$(MAKE) -C blobstamper clean`
`38`	`33`	`$(MAKE) -C t clean`
`39`	`34`	`$(MAKE) -C libtappp clean`
`40`	`35`
`41`		`-`
`42`		`-`
`43`		`-.PHONY: clean`
`44`	`36`	`clean: blob-stamper-clean`
`45`		`-rm -f*.otest test_pg_op_wrappers test_libblobstamper`
	`37`	`+rm -f*.o`
`46`	`38`	`@echo Clean done!`
`47`	`39`
`48`		`-.PHONY: test`
`49`		`-`
`50`	`40`	`test:`
`51`	`41`	`$(MAKE) -C ttest`
`52`	`42`

Lines changed: 53 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,53 @@`
	`1`	`+#include<string.h>`
	`2`	`+`
	`3`	`+#include<exception>`
	`4`	`+#include<string>`
	`5`	`+#include<cstdlib>`
	`6`	`+`
	`7`	`+#defineWANT_TEST_EXTRAS`
	`8`	`+#include<tap++/tap++.h>`
	`9`	`+`
	`10`	`+#include<string.h>`
	`11`	`+#include<stdio.h>`
	`12`	`+#include<stdlib.h>`
	`13`	`+`
	`14`	`+extern"C" {`
	`15`	`+#include"pg_op_wrappers.h"`
	`16`	`+}`
	`17`	`+`
	`18`	`+usingnamespaceTAP;`
	`19`	`+`
	`20`	`+`
	`21`	`+/* Tests for postgres geo type stamps*/`
	`22`	`+`
	`23`	`+double sample_data[] = {1,2,3,4.2e01,5,6,7};`
	`24`	`+`
	`25`	`+int`
	`26`	`+main()`
	`27`	`+{`
	`28`	`+char * char_sample_data = (char *) sample_data;`
	`29`	`+size_t sample_data_size =sizeof(double) *7;`
	`30`	`+`
	`31`	`+TEST_START(3);`
	`32`	`+ {`
	`33`	`+char res1, res2;`
	`34`	`+poly_contain_prepare(char_sample_data, sample_data_size, &res1, &res2);`
	`35`	`+`
	`36`	`+ok(!strcmp(res1,"(1, 2)"),"first argument of poly_contain_pt op");`
	`37`	`+ok(!strcmp(res2,"((3, 42), (5, 6))"),"second argument of poly_contain_pt op");`
	`38`	`+`
	`39`	`+if (res1)free(res1);`
	`40`	`+if (res2)free(res2);`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ {`
	`44`	`+char *res;`
	`45`	`+poly_center_prepare(char_sample_data, sample_data_size, &res);`
	`46`	`+`
	`47`	`+ok(!strcmp(res,"((1, 2), (3, 42), (5, 6))"),"the only argument of poly_center op");`
	`48`	`+`
	`49`	`+if (res)free(res);`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ TEST_END;`
	`53`	`+}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ DEBUG := -ggdb3 -DDEBUG`
`6`	`6`	`CXXFLAGS :=$(DEBUG)$(WARNINGS) -fPIC`
`7`	`7`	`PREFIX := /usr/local`
`8`	`8`	`LIBRARY_VAR := LD_LIBRARY_PATH`
`9`		`-TEST_GOALS := ./00-sanity.t ./001-blob-generic.t ./100-stamp-base.t ./110-stamp-atomic.t ./500-stamp-pg-type-geo.t`
	`9`	`+TEST_GOALS := ./00-sanity.t ./001-blob-generic.t ./100-stamp-base.t ./110-stamp-atomic.t ./500-stamp-pg-type-geo.t ./700-wrapper-pg-type-geo.t`
`10`	`10`
`11`	`11`	`all:$(TEST_GOALS)`
`12`	`12`
`@@ -18,6 +18,7 @@ BLOB_STAMPER_OBJ = ../blobstamper/blob.o \`
`18`	`18`	`../blobstamper/stamp.o\`
`19`	`19`	`../blobstamper/stamp_atomic.o\`
`20`	`20`	`../blobstamper/stamp_pg_type_geo.o\`
	`21`	`+../pg_op_wrappers.o\`
`21`	`22`
`22`	`23`
`23`	`24`	`build-libtappp:`

Lines changed: 0 additions & 22 deletions

This file was deleted.

Comments

(0)