Changeset 12385

Timestamp:

Mar 9, 2007, 12:11:55 PM (19 years ago)

Author:

gusciora

Message:

Fixed problem with running in the test directory.

File:

• trunk/psLib/test/types/tap_psLookupTable_all.c (modified) (7 diffs)

trunk/psLib/test/types/tap_psLookupTable_all.c

@@ -26 +26 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(28);
+    plan_tests(29);
 
     //    note("Tests for psLookupTable Functions");
@@ -160 +160 @@
     //Attempt to read with valid inputs
     {
-        outVec = psVectorsReadFromFile("table.dat",
+        outVec = psVectorsReadFromFile("types/table.dat",
                                        "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf");
         ok( outVec != NULL &&  outVec->n == 9 &&
@@ -193 +193 @@
     // Attempt to read valid table
     psFree(table1);
-    table1 = psLookupTableAlloc("table.dat",
+    table1 = psLookupTableAlloc("types/table.dat",
                                 "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0);
     numRows = psLookupTableRead(table1);
@@ -210 +210 @@
     //Attempt to import table with unsorted array column
     psFree(table1);
-    table1 = psLookupTableAlloc("table.dat",
+    table1 = psLookupTableAlloc("types/table.dat",
                                 "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0);
     {
@@ -224 +224 @@
         checkMem();
     }
-
 }
 
@@ -232 +231 @@
     psLookupTable *table1 = NULL;
     psVector *vec = NULL;
-    table1 = psLookupTableAlloc("table.dat",
+    table1 = psLookupTableAlloc("types/table.dat",
                                 "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0);
     psLookupTable *table2 = NULL;
-    table2 = psLookupTableAlloc("table.dat",
+    table2 = psLookupTableAlloc("types/table.dat",
                                 "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf", 0);
     psLookupTableRead(table2);
@@ -252 +251 @@
             "psLookupTableInterpolateAll:     return NULL for NULL table values.");
     }
+
+    ok(table2->values != NULL, "table->values not NULL");
     //Return NULL for table with table->values->n == 0
     {