@@ -9,8 +9,8 @@ final class GridTests: XCTestCase {
99 . addCol ( name: " equip " )
1010 . addCol ( name: " siteRef " )
1111 . addCol ( name: " installed " )
12- . addRow ( [ " RTU-1 " , marker, Ref ( " 153c-699a " , dis: " HQ " ) , Date ( year: 2005 , month: 6 , day: 1 ) ] )
13- . addRow ( [ " RTU-2 " , marker, Ref ( " 153c-699b " , dis: " Library " ) , Date ( year: 1997 , month: 7 , day: 12 ) ] )
12+ . addRow ( [ " dis " : " RTU-1 " , " equip " : marker, " siteRef " : Ref ( " 153c-699a " , dis: " HQ " ) , " installed " : Date ( year: 2005 , month: 6 , day: 1 ) ] )
13+ . addRow ( [ " dis " : " RTU-2 " , " equip " : marker, " siteRef " : Ref ( " 153c-699b " , dis: " Library " ) , " installed " : Date ( year: 1997 , month: 7 , day: 12 ) ] )
1414 . toGrid ( )
1515 let jsonString = #"{"_kind":"grid","meta":{"ver":"3.0","foo":"bar"},"cols":[{"name":"dis","meta":{"dis":"Equip Name"}},{"name":"equip"},{"name":"siteRef"},{"name":"installed"}],"rows":[{"dis":"RTU-1","equip":{"_kind":"marker"},"siteRef":{"_kind":"ref","val":"153c-699a","dis":"HQ"},"installed":{"_kind":"date","val":"2005-06-01"}},{"dis": "RTU-2","equip":{"_kind":"marker"},"siteRef":{"_kind":"ref","val":"153c-699b","dis":"Library"},"installed":{"_kind":"date","val":"1997-07-12"}}]}"#
1616
@@ -54,8 +54,8 @@ final class GridTests: XCTestCase {
5454 . addCol ( name: " equip " )
5555 . addCol ( name: " siteRef " )
5656 . addCol ( name: " installed " )
57- . addRow ( [ " RTU-1 " , marker, Ref ( " 153c-699a " , dis: " HQ " ) , Date ( year: 2005 , month: 6 , day: 1 ) ] )
58- . addRow ( [ " RTU-2 " , marker, Ref ( " 153c-699b " , dis: " Library " ) , Date ( year: 1997 , month: 7 , day: 12 ) ] )
57+ . addRow ( [ " dis " : " RTU-1 " , " equip " : marker, " siteRef " : Ref ( " 153c-699a " , dis: " HQ " ) , " installed " : Date ( year: 2005 , month: 6 , day: 1 ) ] )
58+ . addRow ( [ " dis " : " RTU-2 " , " equip " : marker, " siteRef " : Ref ( " 153c-699b " , dis: " Library " ) , " installed " : Date ( year: 1997 , month: 7 , day: 12 ) ] )
5959 . toGrid ( )
6060 . toZinc ( ) ,
6161 """
@@ -86,17 +86,17 @@ final class GridTests: XCTestCase {
8686 . addCol ( name: " equip " )
8787 . addCol ( name: " siteRef " )
8888 . addCol ( name: " managed " )
89- . addRow ( [ " RTU-1 " , marker, Ref ( " 153c-699a " , dis: " HQ " ) , true ] )
90- . addRow ( [ " RTU-2 " , marker, Ref ( " 153c-699b " , dis: " Library " ) , false ] )
89+ . addRow ( [ " dis " : " RTU-1 " , " equip " : marker, " siteRef " : Ref ( " 153c-699a " , dis: " HQ " ) , " managed " : true ] )
90+ . addRow ( [ " dis " : " RTU-2 " , " equip " : marker, " siteRef " : Ref ( " 153c-699b " , dis: " Library " ) , " managed " : false ] )
9191
9292 let builder2 = try GridBuilder ( )
9393 . setMeta ( [ " ver " : " 3.0 " , " foo " : " bar " ] )
9494 . addCol ( name: " dis " , meta: [ " dis " : " Equip Name " ] )
9595 . addCol ( name: " equip " )
9696 . addCol ( name: " siteRef " )
9797 . addCol ( name: " managed " )
98- . addRow ( [ " RTU-1 " , marker, Ref ( " 153c-699a " , dis: " HQ " ) , false ] )
99- . addRow ( [ " RTU-2 " , marker, Ref ( " 153c-699b " , dis: " Library " ) , false ] )
98+ . addRow ( [ " dis " : " RTU-1 " , " equip " : marker, " siteRef " : Ref ( " 153c-699a " , dis: " HQ " ) , " managed " : false ] )
99+ . addRow ( [ " dis " : " RTU-2 " , " equip " : marker, " siteRef " : Ref ( " 153c-699b " , dis: " Library " ) , " managed " : false ] )
100100
101101
102102 // Test basic
0 commit comments