Changeset 4865c64 in tol for toltcl/tests/tableset.tcl

Timestamp:

Feb 23, 2013, 9:13:44 AM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

f5b207c

Parents:

e1771b5

Message:

refs #1369, updating test code for tableset command

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5657 be4846ae-f051-483a-831f-b64e7d08527f

File:

• toltcl/tests/tableset.tcl (modified) (11 diffs)

toltcl/tests/tableset.tcl

@@ -18 +18 @@
 proc TestWrong { } {
   #no puede crear el comando
-  tol::tableset create tblset AllLinear
+  tol::tableset create tblset {Set AllLinear}
   tol::tableset destroy tblset 
 }
@@ -28 +28 @@
 proc TestWrong1 { } {
   #
-  tol::tableset create tblset AxisDatingList
+  tol::tableset create tblset {Set AxisDatingList}
   puts "Da como resultado [tblset info datarows] filas, en realidad son 10"
   puts "Vamos a imprimir todo el contenido del conjunto"
@@ -49 +49 @@
   puts "Testing: Generic Header ..."
   tol::console eval {Set setGenHead = [[ [[1,2,3]], [[2,4]], [[6,7,8]] ]]; }
-  tol::tableset create tblset setGenHead
+  tol::tableset create tblset {Set setGenHead}
   # test the results
   set header_type [tblset info header]
@@ -84 +84 @@
   tol::console eval {Struct STR { Real RealField; Text TextField };}
   tol::console eval {Set SET = [[ STR(1,"value1"), STR(2,"value2") ]];}
-  tol::tableset create tblset SET
+  tol::tableset create tblset {Set SET}
   # test the results
   set header_type [tblset info header]
@@ -118 +118 @@
   tol::console eval {Set setGenHead = \
                          [[ [["A","B","C"]], [[1,2,3]], [[2,4]], [[6,7,8]] ]]; }
-  tol::tableset create tblset setGenHead
+  tol::tableset create tblset {Set setGenHead}
   # test the results
   set header_type [tblset info header]
@@ -151 +151 @@
   puts "Testing set with real content ..."
   tol::console eval {Set realSet = [[ [[1,?,3,5,6]], [[4,Real(1/0),?]], [[7,Real(-1/0),9,7]] ]];}
-  tol::tableset create tblset realSet
+  tol::tableset create tblset {Set realSet}
   puts [tblset info columns]
   puts [tblset data column 0]
@@ -173 +173 @@
   puts "Testing set with date content ..."
   tol::console eval {Set dteSet = [[ [["Date1", "Date2"]], [[y1999,y2000]], [[y2001,y2002]] ]];}
-  tol::tableset create tblset dteSet
+  tol::tableset create tblset {Set dteSet}
   puts [tblset info columns]
   puts [tblset data column 0]
@@ -195 +195 @@
                                      [[1,      y2000,   "aaa"]],
                                      [[2,      y2001,   "bbb"]] ]];}
-  tol::tableset create tblset mixSet
+  tol::tableset create tblset {Set mixSet}
   puts [tblset info columns]
   puts [tblset data column 0]
@@ -219 +219 @@
                                      [[1,          y2000,   "aaa", "kkk"]],
                                      [[y2002,      "aaa",   "bbb"]] ]];}
-  tol::tableset create tblset mixSet
+  tol::tableset create tblset {Set mixSet}
   puts "Header info : [tblset info header]"
   puts [tblset info columns]
@@ -243 +243 @@
                                       [[11,11.5, 4   ]],
                                       [[12,12.5, 7, 8]] ]]; }
-  tol::tableset create tblset __error
+  tol::tableset create tblset {Set __error}
   tol::tableset destroy tblset
 }
@@ -251 +251 @@
   tol::console eval {Set s1 = [[row1]];}
   
-  tol::tableset create tbl s1
+  tol::tableset create tbl {Set s1}
   puts [tbl info columns]
   tol::tableset destroy tbl
   tol::console stack release s1 row1
 }
+
+proc Test_Ticket1450 { } {
+  tol::console eval {
+    Set s2 = BinGroup("|", For(1, 4, Set (Real i) {
+      Set For(1, 10, Set (Real j) {
+        [[j, If(i==j, ?, i+j)]]
+      })
+    }));
+  }
+  tol::tableset create tbls2 {Set s2}
+}