Index: /trunk/psLib/test/collections/tst_psVectorSort_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 2668) +++ /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 2669) @@ -4,12 +4,14 @@ * * This test driver contains the following tests for psVectorSort test point 1: - * A) Create float vectors - * B) Sort input float vector and put results into output float vector + * A) Sort input vector to output vector for all types + * B) Sort input float vector into itself + * C) Attempt to sort vector with invalid type (i.e. PS_TYPE_BOOL) + * D) Sort input vector with zero items * C) Free float vectors * * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-22 21:07:42 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-09 00:47:20 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,4 +22,55 @@ #include "psTest.h" +#define tstVectorSortByType(datatype,value) \ +in = psVectorAlloc(7,PS_TYPE_##datatype); \ +in->n = 7; \ +out = psVectorAlloc(7,PS_TYPE_##datatype); \ +out->n = 7; \ +in->data.datatype[0] = 7+value; \ +in->data.datatype[1] = 9+value; \ +in->data.datatype[2] = 3+value; \ +in->data.datatype[3] = 1+value; \ +in->data.datatype[4] = 5+value; \ +in->data.datatype[5] = 5+value; \ +in->data.datatype[6] = 0+value; \ +tempVec = out; \ +out = psVectorSort(out, in); \ +if(tempVec != out) { \ + psError(PS_ERR_UNKNOWN,true,"Return value not equal to orignal output argument passed to function"); \ + return 5; \ +} \ +if(out->data.datatype[0] != in->data.datatype[6]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[0] type %s",#datatype); \ + return 10; \ +} \ +if(out->data.datatype[1] != in->data.datatype[3]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[1] type %s",#datatype); \ + return 20; \ +} \ +if(out->data.datatype[2] != in->data.datatype[2]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[2] type %s",#datatype); \ + return 30; \ +} \ +if(out->data.datatype[3] != in->data.datatype[4]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[3] type %s",#datatype); \ + return 40; \ +} \ +if(out->data.datatype[4] != in->data.datatype[5]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[4] %s",#datatype); \ + return 50; \ +} \ +if(out->data.datatype[5] != in->data.datatype[0]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[5] %s",#datatype); \ + return 60; \ +} \ +if(out->data.datatype[6] != in->data.datatype[1]) { \ + psError(PS_ERR_UNKNOWN,true,"Improper sort out[6] %s",#datatype); \ + return 70; \ +} \ +psFree(in); \ +psFree(out); + + + psS32 main(psS32 argc, char* argv[]) @@ -27,11 +80,22 @@ psVector *tempVec = NULL; + // Test A - Verify the sort for all supported types + printPositiveTestHeader(stdout,"psVectorSort","Sort all types"); + tstVectorSortByType(S8,0); + tstVectorSortByType(S16,1); + tstVectorSortByType(S32,2); + tstVectorSortByType(S64,3); + tstVectorSortByType(U8,4); + tstVectorSortByType(U16,5); + tstVectorSortByType(U32,6); + tstVectorSortByType(U64,7); + tstVectorSortByType(F32,8); + tstVectorSortByType(F64,9); + printFooter(stdout,"psVectorSort","Sort all types",true); - // Test A - Create float vectors - printPositiveTestHeader(stdout,"psVectorSort", "Create float vectors"); + // Test B - Sort input vector into itself + printPositiveTestHeader(stdout,"psVectorSort", "Sort input float vector into itself"); in = psVectorAlloc(7, PS_TYPE_F32); in->n = 7; - out = psVectorAlloc(7, PS_TYPE_F32); - out->n = 7; in->data.F32[0] = 7.0f; in->data.F32[1] = 9.0f; @@ -41,30 +105,63 @@ in->data.F32[5] = 5.0f; in->data.F32[6] = -20.0f; - for(psS32 i=0; i<7; i++) { - printf("vec[%d] = %f\n", i, in->data.F32[i]); + in = psVectorSort(in, in); + if(in->data.F32[0] != -20.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[0]"); + return 100; } - printFooter(stdout, "psVectorSort", "Create float vectors", true); - - - // Test B - Sort input float vector and put results into output float vector - printPositiveTestHeader(stdout,"psVectorSort", "Sort float vector"); - tempVec = out; - out = psVectorSort(out, in); - for(psS32 i=0; i<7; i++) { - printf("vec[%d] = %f\n", i, out->data.F32[i]); + if(in->data.F32[1] != 1.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[1]"); + return 200; } - if(out != tempVec) { - printf("Error: Return pointer not equal to output argument pointer\n"); + if(in->data.F32[2] != 3.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[2]"); + return 300; } - printFooter(stdout, "psVectorSort", "Sort float vector", true); - - - // Test C - Sort input float vector into itself - printPositiveTestHeader(stdout,"psVectorSort", "Sort input float vector into itself"); - in = psVectorSort(in, in); - for(psS32 i=0; i<7; i++) { - printf("vec[%d] = %f\n", i, out->data.F32[i]); + if(in->data.F32[3] != 5.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[3]"); + return 400; + } + if(in->data.F32[4] != 5.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[4]"); + return 500; + } + if(in->data.F32[5] != 7.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[5]"); + return 600; + } + if(in->data.F32[6] != 9.0f) { + psError(PS_ERR_UNKNOWN,true,"Improper self sort in[6]"); + return 700; } printFooter(stdout, "psVectorSort", "Sort input float vector into itself", true); + + // Test C - Attempt to sort vector with invalid type + printPositiveTestHeader(stdout,"psVectorSort","Invalid vector type"); + in->type.type = PS_TYPE_BOOL; + out = psVectorAlloc(7,PS_TYPE_F32); + psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error messgae"); + tempVec = psVectorSort(out,in); + if(tempVec != out) { + psError(PS_ERR_UNKNOWN,true,"Did not return the specified output vector"); + return 33; + } + psFree(out); + printFooter(stdout,"psVectorSort","Invalid vector type",true); + + // Test D - Sort vector with zero elements + printPositiveTestHeader(stdout,"psVectorSort","Sort zero element vector"); + out = psVectorAlloc(7,PS_TYPE_F32); + tempVec = out; + in->n = 0; + out = psVectorSort(out,in); + if(tempVec != out) { + psError(PS_ERR_UNKNOWN,true,"Did not return the specified output vector"); + return 44; + } + if(out->n != 0) { + psError(PS_ERR_UNKNOWN,true,"Did not proper set the number of elements to zero"); + return 55; + } + printFooter(stdout,"psVectorSort","Sort zero element vector",true); Index: /trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr =================================================================== --- /trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr (revision 2668) +++ /trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr (revision 2669) @@ -0,0 +1,4 @@ +