Bug 1167: Moved the tests of Array compression and expansion from MAc to here.

LCS/Common/test/tStringUtil.cc

@@ -178,6 +178,7 @@ bool testToString()
 
 bool testCompactArray()
 {
+  cout << "\n*** Testing compacting of Array-strings ***\n";
   try {
 	DO_COMPACT_TEST("[ a,b,c ]");
 	DO_COMPACT_TEST("[ aa01,aa06 ]");
@@ -210,6 +211,7 @@ bool testCompactArray()
 
 bool testExpandArray()
 {	
+  cout << "\n*** Testing expanding of Array-strings ***\n";
   try {
 	DO_EXPAND_TEST("[ a,b,c ]");
 	DO_EXPAND_TEST("[ aa01,aa06 ]");

LCS/Common/test/tStringUtil.stdout

@@ -56,3 +56,46 @@ toString(float(M_E),"%e") = 2.718282e+00
 toString(float(M_PI),"%8.4f") =   3.1416
 toString(double(M_E),"%+08.12g") = +2.71828182846
 toString(double(M_PI*1e12),"%+08.12g") = +3.14159265359e+12
+
+*** Testing compacting of Array-strings ***
+[ a,b,c ] ==> [ a,b,c ]
+[ aa01,aa06 ] ==> [aa01,aa06]
+[ aa01,aa02 ] ==> [aa01,aa02]
+[ aa01,aa02,aa03 ] ==> [aa01..aa03]
+[ aa01,aa02,aa03,aa04 ] ==> [aa01..aa04]
+[ aa01,aa02,aa03,aa05 ] ==> [aa01..aa03,aa05]
+[ aa01, aa02 ,aa03,aa05,aa06 ] ==> [aa01..aa03,aa05,aa06]
+[ aa01, bb02 ,aa03,aa05,aa06 ] ==> [ aa01, bb02 ,aa03,aa05,aa06 ]
+[ aa01, aa02 ,aa0003,aa05,aa06 ] ==> [aa01..aa03,aa05,aa06]
+[ aa01,aa02,aa03,aa05,aa06,aa7 ] ==> [aa01..aa03,aa05..aa07]
+[ aa01,aa02,aa03,aa05,a06,aa7 ] ==> [ aa01,aa02,aa03,aa05,a06,aa7 ]
+[ aa01,aa02,aa03,aa05,aaa06,aa7 ] ==> [ aa01,aa02,aa03,aa05,aaa06,aa7 ]
+[22,23,24,25,30,31,33,35] ==> [22..25,30,31,33,35]
+[22,23,24,25,30,31,33,35,36] ==> [22..25,30,31,33,35,36]
+[22,23,24,25,30,31,33,35,36,37] ==> [22..25,30,31,33,35..37]
+[22,23,24,25,30,31,33,35,36,37,37] ==> [22..25,30,31,33,35..37,37]
+[22,23,24,25,30,31,33,35,36,37,40] ==> [22..25,30,31,33,35..37,40]
+[22,23,23,25,30,31,30] ==> [22,23,23,25,30,31,30]
+[22,23,23,25,30,31,30,31] ==> [22,23,23,25,30,31,30,31]
+[22,23,23,25,30,31,30,31,31] ==> [22,23,23,25,30,31,30,31,31]
+[22,23,23,23,23,23,25,30,31,30,31,31] ==> [22,23,23,23,23,23,25,30,31,30,31,31]
+
+*** Testing expanding of Array-strings ***
+[ a,b,c ] ==> [ a,b,c ]
+[ aa01,aa06 ] ==> [ aa01,aa06 ]
+[ aa01,aa02 ] ==> [ aa01,aa02 ]
+[ aa01..aa02 ] ==> [aa01,aa02]
+[ aa01..aa03 ] ==> [aa01,aa02,aa03]
+[ aa01..aa03,aa04 ] ==> [aa01,aa02,aa03,aa04]
+[ aa01..aa03,aa05 ] ==> [aa01,aa02,aa03,aa05]
+[ aa02,aa05..aa07] ==> [aa02,aa05,aa06,aa07]
+[ aa02,aa05..aa04] ==> [ aa02,aa05..aa04]
+[ aa02,aa05..aa05] ==> [aa02,aa05]
+[ aa01..ba03,aa05 ] ==> [ aa01..ba03,aa05 ]
+[ aa01..aa03,ba05 ] ==> [ aa01..aa03,ba05 ]
+[ aa01,ab03,aa05 ] ==> [ aa01,ab03,aa05 ]
+[ aa01,ab03..aa05 ] ==> [ aa01,ab03..aa05 ]
+[ aa01,aa03..ab05 ] ==> [ aa01,aa03..ab05 ]
+[ aa01,bb03..bb05 ] ==> [ aa01,bb03..bb05 ]
+[0..191] ==> [00,01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191]
+[0,1,2,6,3,4,10..19,16] ==> [0,1,2,6,3,4,10,11,12,13,14,15,16,17,18,19,16]