Changeset 8719

Timestamp:

Aug 30, 2006, 6:04:21 PM (20 years ago)

Author:

jhoblitt

Message:

add test.pl as a top level script (temporary hack)
remove \n from calls to diag()

Location:

trunk/psLib/test

Files:

• Makefile.am (modified) (1 diff)
• test.pl (added)
• types/tap_psArray_all.c (modified) (4 diffs)
• types/tap_psListIterator.c (modified) (1 diff)
• types/tap_psMetadata_copying.c (modified) (3 diffs)
• types/tap_psMetadata_creating.c (modified) (4 diffs)
• types/tap_psMetadata_manip.c (modified) (3 diffs)
• types/tap_psMetadata_polynomials.c (modified) (3 diffs)
• types/tap_psMetadata_printing.c (modified) (2 diffs)

trunk/psLib/test/Makefile.am

@@ -1 +1 @@
 SUBDIRS = tap $(SRCDIRS)
+
+TESTS = test.pl
+
+EXTRA_DIST = test.pl
 
 CLEANFILES = core core.* *~
 
 test: check
+

trunk/psLib/test/types/tap_psArray_all.c

@@ -35 +35 @@
 void testArrayAllocs(void)
 {
-    diag("\n  >>>Test 1:  psArrayAlloc, Realloc, & Free Fxns");
+    diag("  >>>Test 1:  psArrayAlloc, Realloc, & Free Fxns");
     psArray *a = NULL;
 
@@ -113 +113 @@
 void testArrayAddRemove(void)
 {
-    diag("\n  >>>Test 2:  psArrayAdd & psArrayRemove Fxns");
+    diag("  >>>Test 2:  psArrayAdd & psArrayRemove Fxns");
     psArray *a = psArrayAlloc(0);
     psS32 *s1 = (psS32*)psAlloc(sizeof(psS32));
@@ -166 +166 @@
 void testArraySetGet(void)
 {
-    diag("\n  >>>Test 3:  psArraySet & psArrayGet Fxns");
+    diag("  >>>Test 3:  psArraySet & psArrayGet Fxns");
     psArray *a = NULL;
     psArray *b = NULL;
@@ -249 +249 @@
 void testArraySort(void)
 {
-    diag("\n  >>>Test 4:  psArray Sort Function");
+    diag("  >>>Test 4:  psArray Sort Function");
     psArray *a = NULL;
     a = psArrayAlloc(3);

trunk/psLib/test/types/tap_psListIterator.c

@@ -69 +69 @@
 int main (void)
 {
-    //plan_tests(158);
+    plan_tests(158);
 
     diag("psListIterator tests");

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -32 +32 @@
 void testMetadataCopy(void)
 {
-    diag("\n  >>>Test 1:  psMetadataCopy");
+    diag("  >>>Test 1:  psMetadataCopy");
     psMetadata *in = NULL;
     psMetadata *out = NULL;
@@ -136 +136 @@
 void testMetadataItemCopy(void)
 {
-    diag("\n  >>>Test 2:  psMetadataItemCopy");
+    diag("  >>>Test 2:  psMetadataItemCopy");
 
     //Return NULL for NULL input psMetadataItem
@@ -383 +383 @@
 void testMetadataItemTransfer(void)
 {
-    diag("\n  >>>Test 3:  psMetadataItemTransfer");
+    diag("  >>>Test 3:  psMetadataItemTransfer");
     psMetadata *out = psMetadataAlloc();
     psMetadata *in = psMetadataAlloc();

trunk/psLib/test/types/tap_psMetadata_creating.c

@@ -34 +34 @@
 void testItemAllocs(void)
 {
-    diag("\n  >>>Test 1:  psMetadataItemAlloc & Free Fxns");
+    diag("  >>>Test 1:  psMetadataItemAlloc & Free Fxns");
     psMetadataItem *itemStr = psMetadataItemAllocStr("itemStr", "", "itemStr");
     psMetadataItem *itemF32 = psMetadataItemAllocF32("itemF32", "", 6.66);
@@ -259 +259 @@
 void testMDAlloc_AddItem(void)
 {
-    diag("\n  >>>Test 2:  psMetadataAlloc, psMemCheckMetadata, & psMetadataAdd Fxns");
+    diag("  >>>Test 2:  psMetadataAlloc, psMemCheckMetadata, & psMetadataAdd Fxns");
     psMetadata *md = NULL;
     //Attempt to free a null metadata
@@ -284 +284 @@
     md1 = psMetadataAlloc();
 
-    diag("\n  >>>Test 3:  psMetadataAddItem");
+    diag("  >>>Test 3:  psMetadataAddItem");
     //Return false for NULL metadata input
     psMetadataItem *item = psMetadataItemAllocBool("item", "", true);
@@ -379 +379 @@
 void testIterAlloc(void)
 {
-    diag("\n  >>>Test 4:  psMetadataIteratorAlloc");
+    diag("  >>>Test 4:  psMetadataIteratorAlloc");
     psMetadata *md = psMetadataAlloc();
     psMetadata *md2 = NULL;

trunk/psLib/test/types/tap_psMetadata_manip.c

@@ -32 +32 @@
 void testLookups(void)
 {
-    diag("\n  >>>Test 1:  psMetadataLookup Functions");
+    diag("  >>>Test 1:  psMetadataLookup Functions");
     psMetadata *md = psMetadataAlloc();
     psMetadataAddStr(md, PS_LIST_TAIL, "itemStr", 0, "I am a string", "GNIRTS");
@@ -311 +311 @@
 void testRemoves(void)
 {
-    diag("\n  >>>Test 2:  psMetadataRemove Functions");
+    diag("  >>>Test 2:  psMetadataRemove Functions");
     psMetadata *md = psMetadataAlloc();
     psMetadataAddStr(md, PS_LIST_TAIL, "itemStr", 0, "I am a string", "GNIRTS");
@@ -399 +399 @@
 void testIter(void)
 {
-    diag("\n  >>>Test 3:  psMetadataIterator Functions");
+    diag("  >>>Test 3:  psMetadataIterator Functions");
     psMetadata *md = psMetadataAlloc();
     psMetadataAddS32(md, PS_LIST_HEAD, "S32_1", PS_META_NO_REPLACE, "", 1);

trunk/psLib/test/types/tap_psMetadata_polynomials.c

@@ -32 +32 @@
 void test2Dcase(void)
 {
-    diag("\n  >>>Test 1:  psPolynomial2DtoMD & psPolynomial2DfromMD functions");
+    diag("  >>>Test 1:  psPolynomial2DtoMD & psPolynomial2DfromMD functions");
     psMetadata *md = psMetadataAlloc();
     psMetadata *out = NULL;
@@ -70 +70 @@
 void test3Dcase(void)
 {
-    diag("\n  >>>Test 2:  psPolynomial3DtoMD & psPolynomial3DfromMD functions");
+    diag("  >>>Test 2:  psPolynomial3DtoMD & psPolynomial3DfromMD functions");
     psMetadata *md = psMetadataAlloc();
     psMetadata *out = NULL;
@@ -87 +87 @@
 void test4Dcase(void)
 {
-    diag("\n  >>>Test 3:  psPolynomial4DtoMD & psPolynomial4DfromMD functions");
+    diag("  >>>Test 3:  psPolynomial4DtoMD & psPolynomial4DfromMD functions");
     psMetadata *md = psMetadataAlloc();
     psMetadata *out = NULL;

trunk/psLib/test/types/tap_psMetadata_printing.c

@@ -176 +176 @@
 void testMetaPrint(void)
 {
-    diag("\n  >>Test 1:  psMetadataPrint");
+    diag("  >>Test 1:  psMetadataPrint");
     FILE *fd = fopen("psMetadataPrint.out", "w");
     FILE *fd_read = fopen("Makefile", "r");
@@ -242 +242 @@
 void testMetaItemPrint(void)
 {
-    diag("\n  >>Test2:  psMetadataItemPrint");
+    diag("  >>Test2:  psMetadataItemPrint");
     FILE *fd;
     //bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item)