diff options
| author | Phil Shafer <phil@FreeBSD.org> | 2023-01-30 04:10:53 +0000 |
|---|---|---|
| committer | Phil Shafer <phil@FreeBSD.org> | 2023-01-30 04:10:53 +0000 |
| commit | 7087c8de43b0d5d27c52da6ba2ba4957b7e336ff (patch) | |
| tree | 72d4cef4104344468fd5196dd8f0ce4dbe765039 /tests | |
| parent | b1cbac9ff49d141064601671b4f3af79b4d06ab5 (diff) | |
Vendor import of Juniper libxo at 1.6.0vendor/Juniper/libxo
Diffstat (limited to 'tests')
48 files changed, 155 insertions, 1572 deletions
diff --git a/tests/core/Makefile.am b/tests/core/Makefile.am index c3b4200298fb..1e7010711757 100644 --- a/tests/core/Makefile.am +++ b/tests/core/Makefile.am @@ -23,8 +23,7 @@ test_08.c \ test_09.c \ test_10.c \ test_11.c \ -test_12.c \ -test_13.c +test_12.c test_01_test_SOURCES = test_01.c test_02_test_SOURCES = test_02.c @@ -38,7 +37,6 @@ test_09_test_SOURCES = test_09.c test_10_test_SOURCES = test_10.c test_11_test_SOURCES = test_11.c test_12_test_SOURCES = test_12.c -test_13_test_SOURCES = test_13.c # TEST_CASES := $(shell cd ${srcdir} ; echo *.c ) @@ -98,7 +96,7 @@ TEST_JIG = \ TEST_JIG2 = \ echo "... $$test ... $$fmt ..."; \ -xoopts==warn,$$extra ; \ +xoopts==warn,$$csv ; \ ${TEST_JIG}; true; TEST_FORMATS = T XP JP JPu HP X J H HIPx @@ -121,20 +119,15 @@ test tests: ${bin_PROGRAMS} done) \ done) -@ (${TEST_TRACE} test=test_01.c; base=test_01; \ - ( fmt=Ecsv1; extra=encoder=csv ; \ + ( fmt=Ecsv1; csv=encoder=csv ; \ ${TEST_JIG2} ); \ - ( fmt=Ecsv2; extra=encoder=csv:path=top-level/data/item:no-header ; \ + ( fmt=Ecsv2; csv=encoder=csv:path=top-level/data/item:no-header ; \ ${TEST_JIG2} ); \ - ( fmt=Ecsv3; extra=@csv:path=item:leafs=sku.sold:no-quotes ; \ - ${TEST_JIG2} ); \ - ) - -@ (${TEST_TRACE} test=test_12.c; base=test_12; \ - ( fmt=XPmap; extra=xml,pretty,map-file=${srcdir}/test_12.map ; \ - ${TEST_JIG2} ); \ - ( fmt=JPmap; extra=json,pretty,map-file=${srcdir}/test_12.map ; \ + ( fmt=Ecsv3; csv=@csv:path=item:leafs=sku.sold:no-quotes ; \ ${TEST_JIG2} ); \ ) + one: -@(test=${TEST_CASE}; data=${TEST_DATA}; ${TEST_ONE} ; true) @@ -152,11 +145,6 @@ accept: ${CP} out/$$base.$$fmt.out ${srcdir}/saved/$$base.$$fmt.out ; \ ${CP} out/$$base.$$fmt.err ${srcdir}/saved/$$base.$$fmt.err ; \ done) - -@(test=test_01.c; base=test_12; for fmt in XPmap JPmap ; do \ - echo "... $$test ... $$fmt ..."; \ - ${CP} out/$$base.$$fmt.out ${srcdir}/saved/$$base.$$fmt.out ; \ - ${CP} out/$$base.$$fmt.err ${srcdir}/saved/$$base.$$fmt.err ; \ - done) .c.test: $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -o $@ $< diff --git a/tests/core/saved/test_01.E.out b/tests/core/saved/test_01.E.out index c3ee55c19702..506bfa83526f 100644 --- a/tests/core/saved/test_01.E.out +++ b/tests/core/saved/test_01.E.out @@ -24,7 +24,6 @@ op string: [some-chaos] [[42]] [0] op attr: [test-attr] [attr-value] [0] op open_leaf_list: [sku] [] [0] op string: [sku] [gum-000-1412] [0x2010] -op string: [sku] [sum-000-4121] [0x2010] op close_leaf_list: [sku] [] [0] op string: [host] [my-box] [0] op string: [domain] [example.com] [0] @@ -202,15 +201,6 @@ op content: [mode_octal] [640] [0x8] op content: [links] [1] [0x1000] op string: [user] [user] [0x1000] op string: [group] [group] [0x1000] -op content: [one] [1] [0] -op content: [two] [2] [0] -op content: [three] [3] [0] -op content: [one] [1] [0] -op content: [two] [2] [0] -op content: [three] [3] [0] -op content: [one] [1] [0] -op content: [two] [2] [0] -op content: [three] [3] [0] op close_container: [top-level] [] [0] op finish: [] [] [0] op flush: [] [] [0] diff --git a/tests/core/saved/test_01.H.out b/tests/core/saved/test_01.H.out index 4bfec006c956..b58816d8617f 100644 --- a/tests/core/saved/test_01.H.out +++ b/tests/core/saved/test_01.H.out @@ -1,3 +1,3 @@ <div class="line"><div class="text">static </div><div class="data" data-tag="type">ethernet</div><div class="text"> </div><div class="data" data-tag="type">bridge</div><div class="text"> </div><div class="data" data-tag="type"> 18u</div><div class="text"> </div><div class="data" data-tag="type"> 24</div><div class="text">anchor </div><div class="padding"> </div><div class="data" data-tag="address">0x0</div><div class="text">..</div><div class="data" data-tag="port">1</div></div><div class="line"><div class="text">anchor </div><div class="padding"> </div><div class="data" data-tag="address">0x0</div><div class="text">..</div><div class="data" data-tag="port">1</div></div><div class="line"><div class="text">anchor </div><div class="padding"> </div><div class="data" data-tag="address">0x0</div><div class="text">..</div><div class="data" data-tag="port">1</div></div><div class="line"><div class="text">df </div><div class="data" data-tag="used-percent"> 12</div><div class="units">%</div></div><div class="line"><div class="text">testing argument modifier </div><div class="data" data-tag="host">my-box</div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="text">testing argument modifier with encoding to </div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="label">Label text</div><div class="text"> </div><div class="data" data-tag="label">value</div></div><div class="line"><div class="title">My Title </div><div class="data" data-tag="max-chaos"> very </div><div class="data" data-tag="min-chaos">42</div><div class="data" data-tag="some-chaos">42 -</div><div class="data" data-tag="sku">gum-1412</div><div class="data" data-tag="sku">sum-4121</div><div class="text">Connecting to </div><div class="data" data-tag="host">my-box</div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="title">Item </div><div class="title"> Total Sold</div><div class="title"> In Stock</div><div class="title"> On Order</div><div class="title"> SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum </div><div class="data" data-tag="sold"> 1412</div><div class="data" data-tag="in-stock"> 54</div><div class="data" data-tag="on-order"> 10</div><div class="data" data-tag="sku" data-key="key"> GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope </div><div class="data" data-tag="sold"> 85</div><div class="data" data-tag="in-stock"> 4</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="sku" data-key="key"> HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder </div><div class="data" data-tag="sold"> 0</div><div class="data" data-tag="in-stock"> 2</div><div class="data" data-tag="on-order"> 1</div><div class="data" data-tag="sku" data-key="key"> HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt </div><div class="data" data-tag="sold"> 4123</div><div class="data" data-tag="in-stock"> 144</div><div class="data" data-tag="on-order"> 42</div><div class="data" data-tag="sku" data-key="key"> HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water </div><div class="data" data-tag="sold"> 17</div><div class="data" data-tag="in-stock"> 14</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="sku" data-key="key"> GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">gum</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1412.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">54</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">10</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-415</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">rope</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">85.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">4</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-212</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">ladder</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">2</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-517</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">bolt</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">4123.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">144</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">42</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-632</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">water</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">17.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">14</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-2331</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">fish</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1321.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">45</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-533</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">gum</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">rope</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">ladder</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">bolt</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">water</div></div><div class="line"><div class="title">Item </div><div class="title"> Total Sold</div><div class="title"> In Stock</div><div class="title"> On Order</div><div class="title"> SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum </div><div class="data" data-tag="sold"> 1412</div><div class="data" data-tag="on-order"> 10</div><div class="data" data-tag="in-stock"> 54</div><div class="data" data-tag="sku" data-key="key"> GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope </div><div class="data" data-tag="sold"> 85</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="in-stock"> 4</div><div class="data" data-tag="sku" data-key="key"> HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder </div><div class="data" data-tag="sold"> 0</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order"> 1</div><div class="data" data-tag="in-stock"> 2</div><div class="data" data-tag="sku" data-key="key"> HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt </div><div class="data" data-tag="sold"> 4123</div><div class="data" data-tag="on-order"> 42</div><div class="data" data-tag="in-stock"> 144</div><div class="data" data-tag="sku" data-key="key"> HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water </div><div class="data" data-tag="sold"> 17</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="in-stock"> 14</div><div class="data" data-tag="sku" data-key="key"> GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div></div><div class="line"><div class="text">X</div><div class="padding"> </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">425</div></div><div class="line"><div class="text">X</div><div class="padding"> </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">455</div></div><div class="line"><div class="text"> </div><div class="data" data-tag="links">links</div><div class="text"> </div><div class="data" data-tag="user">user</div><div class="text"> </div><div class="data" data-tag="group">group</div><div class="text"> </div></div><div class="line"><div class="data" data-tag="links">3 </div><div class="data" data-tag="post">this </div></div><div class="line"><div class="data" data-tag="mode">/some/file</div><div class="text"> </div><div class="data" data-tag="links"> 1</div><div class="text"> </div><div class="data" data-tag="user">user </div><div class="text"> </div><div class="data" data-tag="group">group </div><div class="text"> </div></div><div class="line"><div class="text">Testing...</div><div class="data" data-tag="one">1</div><div class="text">...</div><div class="data" data-tag="two">2</div><div class="text">...</div><div class="data" data-tag="three">3</div></div><div class="line"><div class="text">Testing...</div><div class="data" data-tag="one">1</div><div class="text">...</div><div class="data" data-tag="two">2</div><div class="text">...</div><div class="data" data-tag="three">3</div></div><div class="line"><div class="text">Xesting...</div><div class="data" data-tag="one">1</div><div class="text">...</div><div class="data" data-tag="two">2</div><div class="text">...</div><div class="data" data-tag="three">3</div></div>
\ No newline at end of file +</div><div class="data" data-tag="sku">gum-1412</div><div class="text">Connecting to </div><div class="data" data-tag="host">my-box</div><div class="text">.</div><div class="data" data-tag="domain">example.com</div><div class="text">...</div></div><div class="line"><div class="title">Item </div><div class="title"> Total Sold</div><div class="title"> In Stock</div><div class="title"> On Order</div><div class="title"> SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum </div><div class="data" data-tag="sold"> 1412</div><div class="data" data-tag="in-stock"> 54</div><div class="data" data-tag="on-order"> 10</div><div class="data" data-tag="sku" data-key="key"> GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope </div><div class="data" data-tag="sold"> 85</div><div class="data" data-tag="in-stock"> 4</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="sku" data-key="key"> HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder </div><div class="data" data-tag="sold"> 0</div><div class="data" data-tag="in-stock"> 2</div><div class="data" data-tag="on-order"> 1</div><div class="data" data-tag="sku" data-key="key"> HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt </div><div class="data" data-tag="sold"> 4123</div><div class="data" data-tag="in-stock"> 144</div><div class="data" data-tag="on-order"> 42</div><div class="data" data-tag="sku" data-key="key"> HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water </div><div class="data" data-tag="sold"> 17</div><div class="data" data-tag="in-stock"> 14</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="sku" data-key="key"> GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">gum</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1412.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">54</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">10</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-415</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">rope</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">85.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">4</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-212</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">ladder</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">2</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-517</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">bolt</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">4123.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">144</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">42</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">HRD-000-632</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">water</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">17.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">14</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">2</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-2331</div></div><div class="line"><div class="label">Item</div><div class="text"> '</div><div class="data" data-tag="name" data-key="key">fish</div><div class="text">':</div></div><div class="line"><div class="padding"> </div><div class="label">Total sold</div><div class="text">: </div><div class="data" data-tag="sold">1321.0</div></div><div class="line"><div class="padding"> </div><div class="label">In stock</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="in-stock">45</div></div><div class="line"><div class="padding"> </div><div class="label">On order</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="on-order">1</div></div><div class="line"><div class="padding"> </div><div class="label">SKU</div><div class="text">: </div><div class="data" data-tag="sku" data-key="key">GRO-000-533</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">gum</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">rope</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">ladder</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">bolt</div></div><div class="line"><div class="label">Item</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="item">water</div></div><div class="line"><div class="title">Item </div><div class="title"> Total Sold</div><div class="title"> In Stock</div><div class="title"> On Order</div><div class="title"> SKU</div></div><div class="line"><div class="data" data-tag="name" data-key="key">gum </div><div class="data" data-tag="sold"> 1412</div><div class="data" data-tag="on-order"> 10</div><div class="data" data-tag="in-stock"> 54</div><div class="data" data-tag="sku" data-key="key"> GRO-000-415</div></div><div class="line"><div class="data" data-tag="name" data-key="key">rope </div><div class="data" data-tag="sold"> 85</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="in-stock"> 4</div><div class="data" data-tag="sku" data-key="key"> HRD-000-212</div></div><div class="line"><div class="data" data-tag="name" data-key="key">ladder </div><div class="data" data-tag="sold"> 0</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order"> 1</div><div class="data" data-tag="in-stock"> 2</div><div class="data" data-tag="sku" data-key="key"> HRD-000-517</div></div><div class="line"><div class="data" data-tag="name" data-key="key">bolt </div><div class="data" data-tag="sold"> 4123</div><div class="data" data-tag="on-order"> 42</div><div class="data" data-tag="in-stock"> 144</div><div class="data" data-tag="sku" data-key="key"> HRD-000-632</div></div><div class="line"><div class="data" data-tag="name" data-key="key">water </div><div class="data" data-tag="sold"> 17</div><div class="text">Extra: </div><div class="data" data-tag="extra">special</div><div class="data" data-tag="on-order"> 2</div><div class="data" data-tag="in-stock"> 14</div><div class="data" data-tag="sku" data-key="key"> GRO-000-2331</div></div><div class="line"></div><div class="line"></div><div class="line"><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div><div class="text">X</div></div><div class="line"><div class="text">X</div><div class="padding"> </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">425</div></div><div class="line"><div class="text">X</div><div class="padding"> </div><div class="text">X</div><div class="label">Cost</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="cost">455</div></div><div class="line"><div class="text"> </div><div class="data" data-tag="links">links</div><div class="text"> </div><div class="data" data-tag="user">user</div><div class="text"> </div><div class="data" data-tag="group">group</div><div class="text"> </div></div><div class="line"><div class="data" data-tag="links">3 </div><div class="data" data-tag="post">this </div></div><div class="line"><div class="data" data-tag="mode">/some/file</div><div class="text"> </div><div class="data" data-tag="links"> 1</div><div class="text"> </div><div class="data" data-tag="user">user </div><div class="text"> </div><div class="data" data-tag="group">group </div><div class="text"> </div></div>
\ No newline at end of file diff --git a/tests/core/saved/test_01.HIPx.out b/tests/core/saved/test_01.HIPx.out index 1be8bf58f674..da30b72ab7ec 100644 --- a/tests/core/saved/test_01.HIPx.out +++ b/tests/core/saved/test_01.HIPx.out @@ -58,7 +58,6 @@ <div class="data" data-tag="some-chaos" data-xpath="/top-level/some-chaos">42 </div> <div class="data" data-tag="sku" data-xpath="/top-level/sku" data-type="string" data-help="Stock Keeping Unit">gum-1412</div> - <div class="data" data-tag="sku" data-xpath="/top-level/sku" data-type="string" data-help="Stock Keeping Unit">sum-4121</div> <div class="text">Connecting to </div> <div class="data" data-tag="host" data-xpath="/top-level/host">my-box</div> <div class="text">.</div> @@ -436,27 +435,3 @@ <div class="data" data-tag="group" data-xpath="/top-level/group">group </div> <div class="text"> </div> </div> -<div class="line"> - <div class="text">Testing...</div> - <div class="data" data-tag="one" data-xpath="/top-level/one">1</div> - <div class="text">...</div> - <div class="data" data-tag="two" data-xpath="/top-level/two">2</div> - <div class="text">...</div> - <div class="data" data-tag="three" data-xpath="/top-level/three">3</div> -</div> -<div class="line"> - <div class="text">Testing...</div> - <div class="data" data-tag="one" data-xpath="/top-level/one">1</div> - <div class="text">...</div> - <div class="data" data-tag="two" data-xpath="/top-level/two">2</div> - <div class="text">...</div> - <div class="data" data-tag="three" data-xpath="/top-level/three">3</div> -</div> -<div class="line"> - <div class="text">Xesting...</div> - <div class="data" data-tag="one" data-xpath="/top-level/one">1</div> - <div class="text">...</div> - <div class="data" data-tag="two" data-xpath="/top-level/two">2</div> - <div class="text">...</div> - <div class="data" data-tag="three" data-xpath="/top-level/three">3</div> -</div> diff --git a/tests/core/saved/test_01.HP.out b/tests/core/saved/test_01.HP.out index 91e5292d32df..5a7aed05ac0b 100644 --- a/tests/core/saved/test_01.HP.out +++ b/tests/core/saved/test_01.HP.out @@ -58,7 +58,6 @@ <div class="data" data-tag="some-chaos">42 </div> <div class="data" data-tag="sku">gum-1412</div> - <div class="data" data-tag="sku">sum-4121</div> <div class="text">Connecting to </div> <div class="data" data-tag="host">my-box</div> <div class="text">.</div> @@ -436,27 +435,3 @@ <div class="data" data-tag="group">group </div> <div class="text"> </div> </div> -<div class="line"> - <div class="text">Testing...</div> - <div class="data" data-tag="one">1</div> - <div class="text">...</div> - <div class="data" data-tag="two">2</div> - <div class="text">...</div> - <div class="data" data-tag="three">3</div> -</div> -<div class="line"> - <div class="text">Testing...</div> - <div class="data" data-tag="one">1</div> - <div class="text">...</div> - <div class="data" data-tag="two">2</div> - <div class="text">...</div> - <div class="data" data-tag="three">3</div> -</div> -<div class="line"> - <div class="text">Xesting...</div> - <div class="data" data-tag="one">1</div> - <div class="text">...</div> - <div class="data" data-tag="two">2</div> - <div class="text">...</div> - <div class="data" data-tag="three">3</div> -</div> diff --git a/tests/core/saved/test_01.J.out b/tests/core/saved/test_01.J.out index ff6fbf5be2b2..b8c782677916 100644 --- a/tests/core/saved/test_01.J.out +++ b/tests/core/saved/test_01.J.out @@ -1 +1 @@ -{"top-level": {"type":"ethernet","type":"bridge","type":"18u","type":24,"address":"0x0","port":1,"address":"0x0","port":1,"address":"0x0","port":1,"used-percent":12,"kve_start":"0xdeadbeef","kve_end":"0xcabb1e","host":"my-box","domain":"example.com","host":"my-box","domain":"example.com","label":"value","max-chaos":"very","min-chaos":42,"some-chaos":"[42]", "sku": ["gum-000-1412","sum-000-4121"],"host":"my-box","domain":"example.com", "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17,"in-stock":14,"on-order":2}]}, "data2": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412.0,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85.0,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123.0,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17.0,"in-stock":14,"on-order":2}]}, "data3": {"item": [{"sku":"GRO-000-533","name":"fish","sold":1321.0,"in-stock":45,"on-order":1}]}, "data4": {"item": ["gum","rope","ladder","bolt","water"]}, "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"on-order":10,"in-stock":54}, {"sku":"HRD-000-212","name":"rope","sold":85,"extra":"special","on-order":2,"in-stock":4}, {"sku":"HRD-000-517","name":"ladder","sold":0,"extra":"special","on-order":1,"in-stock":2}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"on-order":42,"in-stock":144}, {"sku":"GRO-000-2331","name":"water","sold":17,"extra":"special","on-order":2,"in-stock":14}]},"cost":425,"cost":455,"mode":"mode","mode_octal":"octal","links":"links","user":"user","group":"group","pre":"that","links":3,"post":"this","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group","one":1,"two":2,"three":3,"one":1,"two":2,"three":3,"one":1,"two":2,"three":3}} +{"top-level": {"type":"ethernet","type":"bridge","type":"18u","type":24,"address":"0x0","port":1,"address":"0x0","port":1,"address":"0x0","port":1,"used-percent":12,"kve_start":"0xdeadbeef","kve_end":"0xcabb1e","host":"my-box","domain":"example.com","host":"my-box","domain":"example.com","label":"value","max-chaos":"very","min-chaos":42,"some-chaos":"[42]", "sku": ["gum-000-1412"],"host":"my-box","domain":"example.com", "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17,"in-stock":14,"on-order":2}]}, "data2": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412.0,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85.0,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123.0,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17.0,"in-stock":14,"on-order":2}]}, "data3": {"item": [{"sku":"GRO-000-533","name":"fish","sold":1321.0,"in-stock":45,"on-order":1}]}, "data4": {"item": ["gum","rope","ladder","bolt","water"]}, "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"on-order":10,"in-stock":54}, {"sku":"HRD-000-212","name":"rope","sold":85,"extra":"special","on-order":2,"in-stock":4}, {"sku":"HRD-000-517","name":"ladder","sold":0,"extra":"special","on-order":1,"in-stock":2}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"on-order":42,"in-stock":144}, {"sku":"GRO-000-2331","name":"water","sold":17,"extra":"special","on-order":2,"in-stock":14}]},"cost":425,"cost":455,"mode":"mode","mode_octal":"octal","links":"links","user":"user","group":"group","pre":"that","links":3,"post":"this","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"}} diff --git a/tests/core/saved/test_01.JP.out b/tests/core/saved/test_01.JP.out index 31d07a4adde7..71a77cea81df 100644 --- a/tests/core/saved/test_01.JP.out +++ b/tests/core/saved/test_01.JP.out @@ -22,8 +22,7 @@ "min-chaos": 42, "some-chaos": "[42]", "sku": [ - "gum-000-1412", - "sum-000-4121" + "gum-000-1412" ], "host": "my-box", "domain": "example.com", @@ -181,15 +180,6 @@ "mode_octal": 640, "links": 1, "user": "user", - "group": "group", - "one": 1, - "two": 2, - "three": 3, - "one": 1, - "two": 2, - "three": 3, - "one": 1, - "two": 2, - "three": 3 + "group": "group" } } diff --git a/tests/core/saved/test_01.JPu.out b/tests/core/saved/test_01.JPu.out index eab1d53335a9..747db16f07a7 100644 --- a/tests/core/saved/test_01.JPu.out +++ b/tests/core/saved/test_01.JPu.out @@ -22,8 +22,7 @@ "min_chaos": 42, "some_chaos": "[42]", "sku": [ - "gum-000-1412", - "sum-000-4121" + "gum-000-1412" ], "host": "my-box", "domain": "example.com", @@ -181,15 +180,6 @@ "mode_octal": 640, "links": 1, "user": "user", - "group": "group", - "one": 1, - "two": 2, - "three": 3, - "one": 1, - "two": 2, - "three": 3, - "one": 1, - "two": 2, - "three": 3 + "group": "group" } } diff --git a/tests/core/saved/test_01.T.out b/tests/core/saved/test_01.T.out index f9d473e0c653..89d3157336e2 100644 --- a/tests/core/saved/test_01.T.out +++ b/tests/core/saved/test_01.T.out @@ -7,7 +7,7 @@ testing argument modifier with encoding to .example.com... Label text value My Title very 4242 -gum-1412sum-4121Connecting to my-box.example.com... +gum-1412Connecting to my-box.example.com... Item Total Sold In Stock On Order SKU gum 1412 54 10 GRO-000-415 rope 85 4 2 HRD-000-212 @@ -65,6 +65,3 @@ X XCost: 455 links user group 3 this /some/file 1 user group -Testing...1...2...3 -Testing...1...2...3 -Xesting...1...2...3 diff --git a/tests/core/saved/test_01.X.out b/tests/core/saved/test_01.X.out index a8d1629e17ad..2f1fa8261702 100644 --- a/tests/core/saved/test_01.X.out +++ b/tests/core/saved/test_01.X.out @@ -1 +1 @@ -<top-level><type>ethernet</type><type>bridge</type><type>18u</type><type>24</type><address>0x0</address><port>1</port><address>0x0</address><port>1</port><address>0x0</address><port>1</port><used-percent>12</used-percent><kve_start>0xdeadbeef</kve_start><kve_end>0xcabb1e</kve_end><host>my-box</host><domain>example.com</domain><host>my-box</host><domain>example.com</domain><label>value</label><max-chaos>very</max-chaos><min-chaos>42</min-chaos><some-chaos>[42]</some-chaos><sku test-attr="attr-value">gum-000-1412</sku><sku>sum-000-4121</sku><host>my-box</host><domain>example.com</domain><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><in-stock>14</in-stock><on-order>2</on-order></item></data><data2><item><sku key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412.0</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku key="key">HRD-000-212</sku><name key="key">rope</name><sold>85.0</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123.0</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku key="key">GRO-000-2331</sku><name key="key">water</name><sold>17.0</sold><in-stock>14</in-stock><on-order>2</on-order></item></data2><data3><item><sku key="key">GRO-000-533</sku><name key="key">fish</name><sold>1321.0</sold><in-stock>45</in-stock><on-order>1</on-order></item></data3><data4><item test4="value4">gum</item><item test4="value4">rope</item><item test4="value4">ladder</item><item test4="value4">bolt</item><item test4="value4">water</item></data4><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><on-order>10</on-order><in-stock>54</in-stock></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><extra>special</extra><on-order>2</on-order><in-stock>4</in-stock></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><extra>special</extra><on-order>1</on-order><in-stock>2</in-stock></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><on-order>42</on-order><in-stock>144</in-stock></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><extra>special</extra><on-order>2</on-order><in-stock>14</in-stock></item></data><cost>425</cost><cost>455</cost><mode>mode</mode><mode_octal>octal</mode_octal><links>links</links><user>user</user><group>group</group><pre>that</pre><links>3</links><post>this</post><mode>/some/file</mode><mode_octal>640</mode_octal><links>1</links><user>user</user><group>group</group><one>1</one><two>2</two><three>3</three><one>1</one><two>2</two><three>3</three><one>1</one><two>2</two><three>3</three></top-level>
\ No newline at end of file +<top-level><type>ethernet</type><type>bridge</type><type>18u</type><type>24</type><address>0x0</address><port>1</port><address>0x0</address><port>1</port><address>0x0</address><port>1</port><used-percent>12</used-percent><kve_start>0xdeadbeef</kve_start><kve_end>0xcabb1e</kve_end><host>my-box</host><domain>example.com</domain><host>my-box</host><domain>example.com</domain><label>value</label><max-chaos>very</max-chaos><min-chaos>42</min-chaos><some-chaos>[42]</some-chaos><sku test-attr="attr-value">gum-000-1412</sku><host>my-box</host><domain>example.com</domain><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><in-stock>14</in-stock><on-order>2</on-order></item></data><data2><item><sku key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412.0</sold><in-stock>54</in-stock><on-order>10</on-order></item><item><sku key="key">HRD-000-212</sku><name key="key">rope</name><sold>85.0</sold><in-stock>4</in-stock><on-order>2</on-order></item><item><sku key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><in-stock>2</in-stock><on-order>1</on-order></item><item><sku key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123.0</sold><in-stock>144</in-stock><on-order>42</on-order></item><item><sku key="key">GRO-000-2331</sku><name key="key">water</name><sold>17.0</sold><in-stock>14</in-stock><on-order>2</on-order></item></data2><data3><item><sku key="key">GRO-000-533</sku><name key="key">fish</name><sold>1321.0</sold><in-stock>45</in-stock><on-order>1</on-order></item></data3><data4><item test4="value4">gum</item><item test4="value4">rope</item><item test4="value4">ladder</item><item test4="value4">bolt</item><item test4="value4">water</item></data4><data test="value"><item test2="value2"><sku test3="value3" key="key">GRO-000-415</sku><name key="key">gum</name><sold>1412</sold><on-order>10</on-order><in-stock>54</in-stock></item><item><sku test3="value3" key="key">HRD-000-212</sku><name key="key">rope</name><sold>85</sold><extra>special</extra><on-order>2</on-order><in-stock>4</in-stock></item><item><sku test3="value3" key="key">HRD-000-517</sku><name key="key">ladder</name><sold>0</sold><extra>special</extra><on-order>1</on-order><in-stock>2</in-stock></item><item><sku test3="value3" key="key">HRD-000-632</sku><name key="key">bolt</name><sold>4123</sold><on-order>42</on-order><in-stock>144</in-stock></item><item><sku test3="value3" key="key">GRO-000-2331</sku><name key="key">water</name><sold>17</sold><extra>special</extra><on-order>2</on-order><in-stock>14</in-stock></item></data><cost>425</cost><cost>455</cost><mode>mode</mode><mode_octal>octal</mode_octal><links>links</links><user>user</user><group>group</group><pre>that</pre><links>3</links><post>this</post><mode>/some/file</mode><mode_octal>640</mode_octal><links>1</links><user>user</user><group>group</group></top-level>
\ No newline at end of file diff --git a/tests/core/saved/test_01.XP.out b/tests/core/saved/test_01.XP.out index 7674580d94d9..afa79ada5f81 100644 --- a/tests/core/saved/test_01.XP.out +++ b/tests/core/saved/test_01.XP.out @@ -21,7 +21,6 @@ <min-chaos>42</min-chaos> <some-chaos>[42]</some-chaos> <sku test-attr="attr-value">gum-000-1412</sku> - <sku>sum-000-4121</sku> <host>my-box</host> <domain>example.com</domain> <data test="value"> @@ -169,13 +168,4 @@ <links>1</links> <user>user</user> <group>group</group> - <one>1</one> - <two>2</two> - <three>3</three> - <one>1</one> - <two>2</two> - <three>3</three> - <one>1</one> - <two>2</two> - <three>3</three> </top-level> diff --git a/tests/core/saved/test_13.E.err b/tests/core/saved/test_01.err index e69de29bb2d1..e69de29bb2d1 100644 --- a/tests/core/saved/test_13.E.err +++ b/tests/core/saved/test_01.err diff --git a/tests/core/saved/test_01.out b/tests/core/saved/test_01.out new file mode 100644 index 000000000000..c2ad7a005274 --- /dev/null +++ b/tests/core/saved/test_01.out @@ -0,0 +1,38 @@ +Item Total Sold In Stock On Order SKU +gum 1412 54 10 GRO-000-415 +rope 85 4 2 HRD-000-212 +ladder 0 2 1 HRD-000-517 +bolt 4123 144 42 HRD-000-632 +water 17 14 2 GRO-000-2331 + + +Item 'gum': + Total sold: 1412.0 + In stock: 54 + On order: 10 + SKU: GRO-000-415 +Item 'rope': + Total sold: 85.0 + In stock: 4 + On order: 2 + SKU: HRD-000-212 +Item 'ladder': + Total sold: 0 + In stock: 2 + On order: 1 + SKU: HRD-000-517 +Item 'bolt': + Total sold: 4123.0 + In stock: 144 + On order: 42 + SKU: HRD-000-632 +Item 'water': + Total sold: 17.0 + In stock: 14 + On order: 2 + SKU: GRO-000-2331 +Item 'fish': + Total sold: 1321.0 + In stock: 45 + On order: 1 + SKU: GRO-000-533 diff --git a/tests/core/saved/test_13.H.err b/tests/core/saved/test_02.err index e69de29bb2d1..e69de29bb2d1 100644 --- a/tests/core/saved/test_13.H.err +++ b/tests/core/saved/test_02.err diff --git a/tests/core/saved/test_02.out b/tests/core/saved/test_02.out new file mode 100644 index 000000000000..c2ad7a005274 --- /dev/null +++ b/tests/core/saved/test_02.out @@ -0,0 +1,38 @@ +Item Total Sold In Stock On Order SKU +gum 1412 54 10 GRO-000-415 +rope 85 4 2 HRD-000-212 +ladder 0 2 1 HRD-000-517 +bolt 4123 144 42 HRD-000-632 +water 17 14 2 GRO-000-2331 + + +Item 'gum': + Total sold: 1412.0 + In stock: 54 + On order: 10 + SKU: GRO-000-415 +Item 'rope': + Total sold: 85.0 + In stock: 4 + On order: 2 + SKU: HRD-000-212 +Item 'ladder': + Total sold: 0 + In stock: 2 + On order: 1 + SKU: HRD-000-517 +Item 'bolt': + Total sold: 4123.0 + In stock: 144 + On order: 42 + SKU: HRD-000-632 +Item 'water': + Total sold: 17.0 + In stock: 14 + On order: 2 + SKU: GRO-000-2331 +Item 'fish': + Total sold: 1321.0 + In stock: 45 + On order: 1 + SKU: GRO-000-533 diff --git a/tests/core/saved/test_13.HIPx.err b/tests/core/saved/test_03.err index e69de29bb2d1..e69de29bb2d1 100644 --- a/tests/core/saved/test_13.HIPx.err +++ b/tests/core/saved/test_03.err diff --git a/tests/core/saved/test_03.out b/tests/core/saved/test_03.out new file mode 100644 index 000000000000..da60fb7c9ab3 --- /dev/null +++ b/tests/core/saved/test_03.out @@ -0,0 +1,3 @@ +Terry Jones works in dept #660 +Leslie Patterson works in dept #341 +Ashley Smith works in dept #1440 diff --git a/tests/core/saved/test_13.HP.err b/tests/core/saved/test_10.err index e69de29bb2d1..e69de29bb2d1 100644 --- a/tests/core/saved/test_13.HP.err +++ b/tests/core/saved/test_10.err diff --git a/tests/core/saved/test_10.out b/tests/core/saved/test_10.out new file mode 100644 index 000000000000..c2ad7a005274 --- /dev/null +++ b/tests/core/saved/test_10.out @@ -0,0 +1,38 @@ +Item Total Sold In Stock On Order SKU +gum 1412 54 10 GRO-000-415 +rope 85 4 2 HRD-000-212 +ladder 0 2 1 HRD-000-517 +bolt 4123 144 42 HRD-000-632 +water 17 14 2 GRO-000-2331 + + +Item 'gum': + Total sold: 1412.0 + In stock: 54 + On order: 10 + SKU: GRO-000-415 +Item 'rope': + Total sold: 85.0 + In stock: 4 + On order: 2 + SKU: HRD-000-212 +Item 'ladder': + Total sold: 0 + In stock: 2 + On order: 1 + SKU: HRD-000-517 +Item 'bolt': + Total sold: 4123.0 + In stock: 144 + On order: 42 + SKU: HRD-000-632 +Item 'water': + Total sold: 17.0 + In stock: 14 + On order: 2 + SKU: GRO-000-2331 +Item 'fish': + Total sold: 1321.0 + In stock: 45 + On order: 1 + SKU: GRO-000-533 diff --git a/tests/core/saved/test_12.E.out b/tests/core/saved/test_12.E.out index 2c3bdde6d89a..414311499fee 100644 --- a/tests/core/saved/test_12.E.out +++ b/tests/core/saved/test_12.E.out @@ -83,16 +83,12 @@ op content: [time] [2:15] [0] op string: [hand] [left] [0] op string: [color] [blue] [0] op content: [time] [3:45] [0] -op close_instance: [thing] [] [0] -op close_list: [thing] [] [0] op open_container: [2by4] [] [0x4040010] op string: [4x4] [truck] [0] op string: [2morrow] [tomorrow] [0] op close_container: [2by4] [] [0] -op open_container: [tagÜÖÄ] [] [0x4040010] -op string: [cölor] [blue] [0] -op string: [säfe] [yes] [0] -op close_container: [tagÜÖÄ] [] [0] +op close_instance: [thing] [] [0] +op close_list: [thing] [] [0] op close_container: [data] [] [0] op close_container: [top] [] [0] op finish: [] [] [0] diff --git a/tests/core/saved/test_12.H.out b/tests/core/saved/test_12.H.out index 95a90164e22c..86f0b3476dfa 100644 --- a/tests/core/saved/test_12.H.out +++ b/tests/core/saved/test_12.H.out @@ -1 +1 @@ -<div class="line"><div class="text color-fg-red color-bg-green">Merry XMas!!</div></div><div class="line"><div class="text">One </div><div class="data color-fg-yellow color-bg-blue" data-tag="animal">fish</div><div class="text">, Two </div><div class="data color-fg-green color-bg-yellow" data-tag="animal">fish</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">There is </div><div class="data" data-tag="4x4">truck</div><div class="text"> in </div><div class="data" data-tag="2morrow">tomorrow</div></div><div class="line"><div class="text">The </div><div class="data" data-tag="cölor">blue</div><div class="text"> is </div><div class="data" data-tag="säfe">yes</div></div>
\ No newline at end of file +<div class="line"><div class="text color-fg-red color-bg-green">Merry XMas!!</div></div><div class="line"><div class="text">One </div><div class="data color-fg-yellow color-bg-blue" data-tag="animal">fish</div><div class="text">, Two </div><div class="data color-fg-green color-bg-yellow" data-tag="animal">fish</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">The </div><div class="data color-fg-red" data-tag="name">thing</div><div class="text"> is </div><div class="data color-fg-green" data-tag="color">green</div><div class="text"> til </div><div class="data" data-tag="time">02:15</div></div><div class="line"><div class="text">My </div><div class="data color-fg-red" data-tag="hand">left</div><div class="text"> hand is </div><div class="data color-fg-blue" data-tag="color">blue</div><div class="text"> til </div><div class="data" data-tag="time">03:45</div></div><div class="line"><div class="text">There is </div><div class="data" data-tag="4x4">truck</div><div class="text"> in </div><div class="data" data-tag="2morrow">tomorrow</div></div>
\ No newline at end of file diff --git a/tests/core/saved/test_12.HIPx.out b/tests/core/saved/test_12.HIPx.out index 128a24b80634..a5588c14493b 100644 --- a/tests/core/saved/test_12.HIPx.out +++ b/tests/core/saved/test_12.HIPx.out @@ -169,13 +169,7 @@ </div> <div class="line"> <div class="text">There is </div> - <div class="data" data-tag="4x4" data-xpath="/top/data/2by4/4x4">truck</div> + <div class="data" data-tag="4x4" data-xpath="/top/data/thing[name = 'thing']/2by4/4x4">truck</div> <div class="text"> in </div> - <div class="data" data-tag="2morrow" data-xpath="/top/data/2by4/2morrow">tomorrow</div> -</div> -<div class="line"> - <div class="text">The </div> - <div class="data" data-tag="cölor" data-xpath="/top/data/tagÜÖÄ/cölor">blue</div> - <div class="text"> is </div> - <div class="data" data-tag="säfe" data-xpath="/top/data/tagÜÖÄ/säfe">yes</div> + <div class="data" data-tag="2morrow" data-xpath="/top/data/thing[name = 'thing']/2by4/2morrow">tomorrow</div> </div> diff --git a/tests/core/saved/test_12.HP.out b/tests/core/saved/test_12.HP.out index 7e87d45082c7..f0b04abf3397 100644 --- a/tests/core/saved/test_12.HP.out +++ b/tests/core/saved/test_12.HP.out @@ -173,9 +173,3 @@ <div class="text"> in </div> <div class="data" data-tag="2morrow">tomorrow</div> </div> -<div class="line"> - <div class="text">The </div> - <div class="data" data-tag="cölor">blue</div> - <div class="text"> is </div> - <div class="data" data-tag="säfe">yes</div> -</div> diff --git a/tests/core/saved/test_12.J.out b/tests/core/saved/test_12.J.out index 80ee2b8d3bc6..25a2416195a9 100644 --- a/tests/core/saved/test_12.J.out +++ b/tests/core/saved/test_12.J.out @@ -1 +1 @@ -{"top": {"data": {"animal":"fish","animal":"fish", "thing": [{"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}], "2by4": {"4x4":"truck","2morrow":"tomorrow"}, "tagÜÖÄ": {"cölor":"blue","säfe":"yes"}}}} +{"top": {"data": {"animal":"fish","animal":"fish", "thing": [{"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45"}, {"name":"thing","color":"green","time":"2:15","hand":"left","color":"blue","time":"3:45", "2by4": {"4x4":"truck","2morrow":"tomorrow"}}]}}} diff --git a/tests/core/saved/test_12.JP.out b/tests/core/saved/test_12.JP.out index 23cd6d1eb5a7..0095d8dcc59a 100644 --- a/tests/core/saved/test_12.JP.out +++ b/tests/core/saved/test_12.JP.out @@ -82,17 +82,13 @@ "time": "2:15", "hand": "left", "color": "blue", - "time": "3:45" + "time": "3:45", + "2by4": { + "4x4": "truck", + "2morrow": "tomorrow" + } } - ], - "2by4": { - "4x4": "truck", - "2morrow": "tomorrow" - }, - "tagÜÖÄ": { - "cölor": "blue", - "säfe": "yes" - } + ] } } } diff --git a/tests/core/saved/test_12.JPu.out b/tests/core/saved/test_12.JPu.out index 23cd6d1eb5a7..0095d8dcc59a 100644 --- a/tests/core/saved/test_12.JPu.out +++ b/tests/core/saved/test_12.JPu.out @@ -82,17 +82,13 @@ "time": "2:15", "hand": "left", "color": "blue", - "time": "3:45" + "time": "3:45", + "2by4": { + "4x4": "truck", + "2morrow": "tomorrow" + } } - ], - "2by4": { - "4x4": "truck", - "2morrow": "tomorrow" - }, - "tagÜÖÄ": { - "cölor": "blue", - "säfe": "yes" - } + ] } } } diff --git a/tests/core/saved/test_12.T.out b/tests/core/saved/test_12.T.out index ee17e4b53e45..42ee933808d7 100644 --- a/tests/core/saved/test_12.T.out +++ b/tests/core/saved/test_12.T.out @@ -21,4 +21,3 @@ My [31mleft[0m hand is [34mblue[0m til 03:45 The [31mthing[0m is [32mgreen[0m til 02:15 My [31mleft[0m hand is [34mblue[0m til 03:45 There is truck in tomorrow -The blue is yes diff --git a/tests/core/saved/test_12.X.out b/tests/core/saved/test_12.X.out index 254eb5626a05..072444615c79 100644 --- a/tests/core/saved/test_12.X.out +++ b/tests/core/saved/test_12.X.out @@ -1 +1 @@ -<top><data><animal>fish</animal><animal>fish</animal><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><_2by4><_4x4>truck</_4x4><_2morrow>tomorrow</_2morrow></_2by4><tagÜÖÄ><cölor>blue</cölor><säfe>yes</säfe></tagÜÖÄ></data></top>
\ No newline at end of file +<top><data><animal>fish</animal><animal>fish</animal><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time></thing><thing><name>thing</name><color>green</color><time>2:15</time><hand>left</hand><color>blue</color><time>3:45</time><_2by4><_4x4>truck</_4x4><_2morrow>tomorrow</_2morrow></_2by4></thing></data></top>
\ No newline at end of file diff --git a/tests/core/saved/test_12.XP.out b/tests/core/saved/test_12.XP.out index d56a35623090..b3dc5992fbe9 100644 --- a/tests/core/saved/test_12.XP.out +++ b/tests/core/saved/test_12.XP.out @@ -81,14 +81,10 @@ <hand>left</hand> <color>blue</color> <time>3:45</time> + <_2by4> + <_4x4>truck</_4x4> + <_2morrow>tomorrow</_2morrow> + </_2by4> </thing> - <_2by4> - <_4x4>truck</_4x4> - <_2morrow>tomorrow</_2morrow> - </_2by4> - <tagÜÖÄ> - <cölor>blue</cölor> - <säfe>yes</säfe> - </tagÜÖÄ> </data> </top> diff --git a/tests/core/saved/test_13.E.out b/tests/core/saved/test_13.E.out deleted file mode 100644 index 8b899ff6f0c2..000000000000 --- a/tests/core/saved/test_13.E.out +++ /dev/null @@ -1,170 +0,0 @@ -op create: [test] [] [0] -op open_container: [top] [] [0x4040010] -op open_container: [data] [] [0x4040010] -op open_list: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000000] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000001] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000002] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000003] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000004] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000005] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000006] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000007] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000008] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op open_instance: [entry] [] [0x44040010] -op string: [name] [xx-00000009] [0x88] -op content: [inode] [12] [0x1000] -op content: [blocks] [1234] [0x1000] -op string: [mode] [mode] [0x1000] -op content: [mode_octal] [660] [0x8] -op content: [links] [12] [0x1000] -op string: [user] [phil] [0x1000] -op string: [group] [phil] [0x1000] -op string: [type] [regular] [0x8] -op string: [flags] [123] [0] -op string: [label] [1234] [0x1000] -op content: [size] [12345] [0] -op attr: [value] [1644355825] [0] -op content: [modify-time] [1644355825] [0x28] -op close_instance: [entry] [] [0] -op close_list: [entry] [] [0] -op content: [hits] [72] [0] -op close_container: [data] [] [0] -op close_container: [top] [] [0] -op finish: [] [] [0] -op flush: [] [] [0] diff --git a/tests/core/saved/test_13.H.out b/tests/core/saved/test_13.H.out deleted file mode 100644 index b2a7e9e9d9bc..000000000000 --- a/tests/core/saved/test_13.H.out +++ /dev/null @@ -1 +0,0 @@ -<div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000000</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000001</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000002</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000003</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000004</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000005</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000006</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000007</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000008</div></div><div class="line"><div class="data" data-tag="inode"> 12</div><div class="text"> </div><div class="data" data-tag="blocks">1234</div><div class="text"> </div><div class="data" data-tag="mode">mode</div><div class="text"> </div><div class="data" data-tag="links">12</div><div class="text"> </div><div class="data" data-tag="user">phil</div><div class="text"> </div><div class="data" data-tag="group">phil</div><div class="text"> </div><div class="data" data-tag="flags">123</div><div class="text"> </div><div class="data" data-tag="label">1234</div><div class="text"> </div><div class="data" data-tag="size">12345</div><div class="text"> </div><div class="data" data-tag="modify-time"> 8 Feb 16:30</div><div class="text"> </div><div class="data" data-tag="name">xx-00000009</div></div><div class="line"><div class="label">hits</div><div class="decoration">:</div><div class="padding"> </div><div class="data" data-tag="hits">72</div></div>
\ No newline at end of file diff --git a/tests/core/saved/test_13.HIPx.out b/tests/core/saved/test_13.HIPx.out deleted file mode 100644 index 9d72bcfba0c6..000000000000 --- a/tests/core/saved/test_13.HIPx.out +++ /dev/null @@ -1,236 +0,0 @@ -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000000']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000000']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000000']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000000']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000000']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000000']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000000']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000000']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000000']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000000']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000000</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000001']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000001']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000001']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000001']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000001']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000001']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000001']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000001']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000001']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000001']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000001</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000002']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000002']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000002']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000002']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000002']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000002']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000002']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000002']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000002']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000002']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000002</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000003']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000003']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000003']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000003']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000003']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000003']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000003']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000003']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000003']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000003']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000003</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000004']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000004']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000004']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000004']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000004']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000004']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000004']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000004']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000004']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000004']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000004</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000005']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000005']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000005']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000005']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000005']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000005']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000005']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000005']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000005']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000005']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000005</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000006']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000006']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000006']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000006']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000006']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000006']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000006']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000006']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000006']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000006']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000006</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000007']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000007']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000007']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000007']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000007']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000007']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000007']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000007']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000007']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000007']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000007</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000008']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000008']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000008']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000008']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000008']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000008']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000008']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000008']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000008']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000008']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000008</div> -</div> -<div class="line"> - <div class="data" data-tag="inode" data-xpath="/top/data/entry[name = 'xx-00000009']/inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks" data-xpath="/top/data/entry[name = 'xx-00000009']/blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode" data-xpath="/top/data/entry[name = 'xx-00000009']/mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links" data-xpath="/top/data/entry[name = 'xx-00000009']/links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user" data-xpath="/top/data/entry[name = 'xx-00000009']/user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group" data-xpath="/top/data/entry[name = 'xx-00000009']/group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags" data-xpath="/top/data/entry[name = 'xx-00000009']/flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label" data-xpath="/top/data/entry[name = 'xx-00000009']/label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size" data-xpath="/top/data/entry[name = 'xx-00000009']/size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time" data-xpath="/top/data/entry[name = 'xx-00000009']/modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name" data-xpath="/top/data/entry/name">xx-00000009</div> -</div> -<div class="line"> - <div class="label">hits</div> - <div class="decoration">:</div> - <div class="padding"> </div> - <div class="data" data-tag="hits" data-xpath="/top/data/hits">72</div> -</div> diff --git a/tests/core/saved/test_13.HP.out b/tests/core/saved/test_13.HP.out deleted file mode 100644 index 0bf02bbef886..000000000000 --- a/tests/core/saved/test_13.HP.out +++ /dev/null @@ -1,236 +0,0 @@ -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000000</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000001</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000002</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000003</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000004</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000005</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000006</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000007</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000008</div> -</div> -<div class="line"> - <div class="data" data-tag="inode"> 12</div> - <div class="text"> </div> - <div class="data" data-tag="blocks">1234</div> - <div class="text"> </div> - <div class="data" data-tag="mode">mode</div> - <div class="text"> </div> - <div class="data" data-tag="links">12</div> - <div class="text"> </div> - <div class="data" data-tag="user">phil</div> - <div class="text"> </div> - <div class="data" data-tag="group">phil</div> - <div class="text"> </div> - <div class="data" data-tag="flags">123</div> - <div class="text"> </div> - <div class="data" data-tag="label">1234</div> - <div class="text"> </div> - <div class="data" data-tag="size">12345</div> - <div class="text"> </div> - <div class="data" data-tag="modify-time"> 8 Feb 16:30</div> - <div class="text"> </div> - <div class="data" data-tag="name">xx-00000009</div> -</div> -<div class="line"> - <div class="label">hits</div> - <div class="decoration">:</div> - <div class="padding"> </div> - <div class="data" data-tag="hits">72</div> -</div> diff --git a/tests/core/saved/test_13.J.err b/tests/core/saved/test_13.J.err deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/tests/core/saved/test_13.J.err +++ /dev/null diff --git a/tests/core/saved/test_13.J.out b/tests/core/saved/test_13.J.out deleted file mode 100644 index ecaa5ece2619..000000000000 --- a/tests/core/saved/test_13.J.out +++ /dev/null @@ -1 +0,0 @@ -{"top": {"data": {"entry": [{"name":"xx-00000000","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000001","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000002","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000003","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000004","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000005","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000006","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000007","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000008","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}, {"name":"xx-00000009","inode":12,"blocks":1234,"mode":"mode","mode_octal":660,"links":12,"user":"phil","group":"phil","type":"regular","flags":"123","label":"1234","size":12345,"modify-time":1644355825}],"hits":72}}} diff --git a/tests/core/saved/test_13.JP.err b/tests/core/saved/test_13.JP.err deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/tests/core/saved/test_13.JP.err +++ /dev/null diff --git a/tests/core/saved/test_13.JP.out b/tests/core/saved/test_13.JP.out deleted file mode 100644 index aa6ab890b4d3..000000000000 --- a/tests/core/saved/test_13.JP.out +++ /dev/null @@ -1,159 +0,0 @@ -{ - "top": { - "data": { - "entry": [ - { - "name": "xx-00000000", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000001", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000002", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000003", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000004", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000005", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000006", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000007", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000008", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - }, - { - "name": "xx-00000009", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify-time": 1644355825 - } - ], - "hits": 72 - } - } -} diff --git a/tests/core/saved/test_13.JPu.err b/tests/core/saved/test_13.JPu.err deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/tests/core/saved/test_13.JPu.err +++ /dev/null diff --git a/tests/core/saved/test_13.JPu.out b/tests/core/saved/test_13.JPu.out deleted file mode 100644 index 006b0d4f8f78..000000000000 --- a/tests/core/saved/test_13.JPu.out +++ /dev/null @@ -1,159 +0,0 @@ -{ - "top": { - "data": { - "entry": [ - { - "name": "xx-00000000", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000001", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000002", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000003", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000004", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000005", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000006", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000007", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000008", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - }, - { - "name": "xx-00000009", - "inode": 12, - "blocks": 1234, - "mode": "mode", - "mode_octal": 660, - "links": 12, - "user": "phil", - "group": "phil", - "type": "regular", - "flags": "123", - "label": "1234", - "size": 12345, - "modify_time": 1644355825 - } - ], - "hits": 72 - } - } -} diff --git a/tests/core/saved/test_13.T.err b/tests/core/saved/test_13.T.err deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/tests/core/saved/test_13.T.err +++ /dev/null diff --git a/tests/core/saved/test_13.T.out b/tests/core/saved/test_13.T.out deleted file mode 100644 index cc7dd3a5c1b9..000000000000 --- a/tests/core/saved/test_13.T.out +++ /dev/null @@ -1,11 +0,0 @@ - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000000 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000001 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000002 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000003 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000004 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000005 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000006 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000007 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000008 - 12 1234 mode 12 phil phil 123 1234 12345 8 Feb 16:30 xx-00000009 -hits: 72 diff --git a/tests/core/saved/test_13.X.err b/tests/core/saved/test_13.X.err deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/tests/core/saved/test_13.X.err +++ /dev/null diff --git a/tests/core/saved/test_13.X.out b/tests/core/saved/test_13.X.out deleted file mode 100644 index 7d9e0b29316f..000000000000 --- a/tests/core/saved/test_13.X.out +++ /dev/null @@ -1 +0,0 @@ -<top><data><entry><name>xx-00000000</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000001</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000002</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000003</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000004</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000005</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000006</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000007</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000008</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><entry><name>xx-00000009</name><inode>12</inode><blocks>1234</blocks><mode>mode</mode><mode_octal>660</mode_octal><links>12</links><user>phil</user><group>phil</group><type>regular</type><flags>123</flags><label>1234</label><size>12345</size><modify-time value="1644355825">1644355825</modify-time></entry><hits>72</hits></data></top>
\ No newline at end of file diff --git a/tests/core/saved/test_13.XP.err b/tests/core/saved/test_13.XP.err deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/tests/core/saved/test_13.XP.err +++ /dev/null diff --git a/tests/core/saved/test_13.XP.out b/tests/core/saved/test_13.XP.out deleted file mode 100644 index 32a32db44e72..000000000000 --- a/tests/core/saved/test_13.XP.out +++ /dev/null @@ -1,155 +0,0 @@ -<top> - <data> - <entry> - <name>xx-00000000</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000001</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000002</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000003</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000004</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000005</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000006</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000007</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000008</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <entry> - <name>xx-00000009</name> - <inode>12</inode> - <blocks>1234</blocks> - <mode>mode</mode> - <mode_octal>660</mode_octal> - <links>12</links> - <user>phil</user> - <group>phil</group> - <type>regular</type> - <flags>123</flags> - <label>1234</label> - <size>12345</size> - <modify-time value="1644355825">1644355825</modify-time> - </entry> - <hits>72</hits> - </data> -</top> diff --git a/tests/core/test_01.c b/tests/core/test_01.c index 71cde5a207db..8311efbfc87c 100644 --- a/tests/core/test_01.c +++ b/tests/core/test_01.c @@ -114,8 +114,6 @@ main (int argc, char **argv) xo_attr("test-attr", "attr-value"); xo_emit_field_h(NULL, ",leaf-list,quotes", "sku", "%s-%u", "%s-000-%u", "gum", 1412); - xo_emit_field_h(NULL, ",leaf-list,quotes", "sku", "%s-%u", "%s-000-%u", - "sum", 4121); xo_emit("Connecting to {:host}.{:domain}...\n", "my-box", "example.com"); @@ -257,14 +255,6 @@ main (int argc, char **argv) "/some/file", (int) 0640, 8, 1, 10, "user", 12, "group"); - /* Test retain flag for dynamic data */ - xo_set_flags(NULL, XOF_RETAIN_ALL); - char buf[] = "Testing...{:one/%d}...{:two/%d}...{:three/%d}\n"; - xo_emit(buf, 1, 2, 3); - xo_emit(buf, 1, 2, 3); - buf[0] = 'X'; - xo_emit(buf, 1, 2, 3); - xo_close_container_h(NULL, "top-level"); xo_finish(); diff --git a/tests/core/test_12.c b/tests/core/test_12.c index 8fcc5419e138..32af2d211857 100644 --- a/tests/core/test_12.c +++ b/tests/core/test_12.c @@ -24,7 +24,6 @@ main (int argc, char **argv) int mon = 0; xo_emit_flags_t flags = XOEF_RETAIN; int opt_color = 1; - const char *map = NULL; xo_set_program("test_12"); @@ -51,18 +50,12 @@ main (int argc, char **argv) xo_set_flags(NULL, XOF_INFO); else if (xo_streq(argv[argc], "no-retain")) flags &= ~XOEF_RETAIN; - else if (xo_streq(argv[argc], "map")) { - if (argv[argc + 1]) - map = argv[++argc]; - } else if (xo_streq(argv[argc], "big")) { + else if (xo_streq(argv[argc], "big")) { if (argv[argc + 1]) count = atoi(argv[++argc]); } } - if (map) - xo_map_add_file(NULL, map); - xo_set_flags(NULL, XOF_UNITS); /* Always test w/ this */ if (opt_color) xo_set_flags(NULL, XOF_COLOR); /* Force color output */ @@ -88,17 +81,11 @@ main (int argc, char **argv) xo_emit_f(flags, fmt2, "left", "blue", "blue", 3, 45); } - xo_close_list("thing"); - xo_open_container("2by4"); xo_emit("There is {:4x4} in {:2morrow}\n", "truck", "tomorrow"); xo_close_container("2by4"); - xo_open_container("tagÜÖÄ"); - xo_emit("The {:cölor} is {:säfe}\n", "blue", "yes"); - xo_close_container("tagÜÖÄ"); - xo_close_container("data"); xo_close_container_h(NULL, "top"); diff --git a/tests/core/test_13.c b/tests/core/test_13.c deleted file mode 100644 index 17218e234010..000000000000 --- a/tests/core/test_13.c +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (c) 2022, Juniper Networks, Inc. - * All rights reserved. - * This SOFTWARE is licensed under the LICENSE provided in the - * ../Copyright file. By downloading, installing, copying, or otherwise - * using the SOFTWARE, you agree to be bound by the terms of that - * LICENSE. - * Phil Shafer, Feb 2022 - */ - -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <string.h> -#include <time.h> -#include <langinfo.h> -#include <unistd.h> -#include <wchar.h> -#include <fcntl.h> - -#include "xo_config.h" -#include "xo.h" -#include "xo_encoder.h" - -static size_t padding_for_month[12]; -static size_t month_max_size = 0; - -static const char * -get_abmon(int mon) -{ - - switch (mon) { - case 0: return (nl_langinfo(ABMON_1)); - case 1: return (nl_langinfo(ABMON_2)); - case 2: return (nl_langinfo(ABMON_3)); - case 3: return (nl_langinfo(ABMON_4)); - case 4: return (nl_langinfo(ABMON_5)); - case 5: return (nl_langinfo(ABMON_6)); - case 6: return (nl_langinfo(ABMON_7)); - case 7: return (nl_langinfo(ABMON_8)); - case 8: return (nl_langinfo(ABMON_9)); - case 9: return (nl_langinfo(ABMON_10)); - case 10: return (nl_langinfo(ABMON_11)); - case 11: return (nl_langinfo(ABMON_12)); - } - - /* should never happen */ - abort(); -} - -static void -compute_abbreviated_month_size(void) -{ - int i; - size_t width; - size_t months_width[12]; - - for (i = 0; i < 12; i++) { - width = strlen(get_abmon(i)); - if (width == (size_t)-1) { - month_max_size = -1; - return; - } - months_width[i] = width; - if (width > month_max_size) - month_max_size = width; - } - - for (i = 0; i < 12; i++) - padding_for_month[i] = month_max_size - months_width[i]; -} - -static void -printsize(const char *field, size_t width, off_t bytes) -{ - char fmt[BUFSIZ]; - - /* This format assignment needed to work round gcc bug. */ - snprintf(fmt, sizeof(fmt), "{:%s/%%%dj%sd} ", - field, (int) width, ""); - xo_emit_f(XOEF_NO_RETAIN, fmt, (intmax_t) bytes); -} - -static size_t -ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm) -{ - char *posb, nfmt[BUFSIZ]; - const char *format = fmt; - size_t ret; - - if ((posb = strstr(fmt, "%b")) != NULL) { - if (month_max_size > 0) { - snprintf(nfmt, sizeof(nfmt), "%.*s%s%*s%s", - (int)(posb - fmt), fmt, - get_abmon(tm->tm_mon), - (int)padding_for_month[tm->tm_mon], - "", - posb + 2); - format = nfmt; - } - } - ret = strftime(str, len, format, tm); - return (ret); -} - -static void -printtime(const char *field, time_t ftime) -{ - char longstring[80]; - char fmt[BUFSIZ]; - static time_t now = 0; - const char *format; - static int d_first = -1; - - if (d_first < 0) - d_first = 1; - if (now == 0) - now = time(NULL); - -#define SIXMONTHS ((365 / 2) * 86400) - if (1) - /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R" : "%b %e %R"; - else - /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y" : "%b %e %Y"; - ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime)); - - snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field); - xo_attr("value", "%ld", (long) ftime); - xo_emit_f(XOEF_NO_RETAIN, fmt, longstring); - snprintf(fmt, sizeof(fmt), "{en:%s/%%ld}", field); - xo_emit_f(XOEF_NO_RETAIN, fmt, (long) ftime); -} - - -int -main (int argc, char **argv) -{ - int i, count = 10; - int mon = 0; - xo_emit_flags_t flags = XOF_RETAIN_ALL; - int opt_color = 1; - - xo_set_program("test_13"); - - argc = xo_parse_args(argc, argv); - if (argc < 0) - return 1; - - compute_abbreviated_month_size(); - - for (argc = 1; argv[argc]; argc++) { - if (xo_streq(argv[argc], "xml")) - xo_set_style(NULL, XO_STYLE_XML); - else if (xo_streq(argv[argc], "json")) - xo_set_style(NULL, XO_STYLE_JSON); - else if (xo_streq(argv[argc], "text")) - xo_set_style(NULL, XO_STYLE_TEXT); - else if (xo_streq(argv[argc], "html")) - xo_set_style(NULL, XO_STYLE_HTML); - else if (xo_streq(argv[argc], "no-color")) - opt_color = 0; - else if (xo_streq(argv[argc], "pretty")) - xo_set_flags(NULL, XOF_PRETTY); - else if (xo_streq(argv[argc], "xpath")) - xo_set_flags(NULL, XOF_XPATH); - else if (xo_streq(argv[argc], "info")) - xo_set_flags(NULL, XOF_INFO); - else if (xo_streq(argv[argc], "no-retain")) - flags &= ~XOF_RETAIN_ALL; - else if (xo_streq(argv[argc], "big")) { - if (argv[argc + 1]) { - const char *cp = argv[++argc]; - char *ep; - count = strtoul(cp, &ep, 0); - if (ep && *ep) { - const char suff[] = "kmgt"; - unsigned long mult[] - = { 1000, 1000000, 1000000000, 1000000000000 }; - char *sp = strchr(suff, *ep); - if (sp) { - count *= mult[sp - suff]; - } - } - } - } else if (xo_streq(argv[argc], "null")) { - int fd = open("/dev/null", O_WRONLY); - if (fd >= 0) { - close(1); - dup2(fd, 1); - } - } - } - - xo_set_flags(NULL, XOF_UNITS); /* Always test w/ this */ - if (opt_color) - xo_set_flags(NULL, XOF_COLOR); /* Force color output */ - xo_set_file(stdout); - - xo_open_container("top"); - xo_open_container("data"); - - if (flags != 0) - xo_set_flags(NULL, flags); - - xo_open_list("entry"); - - for (i = 0; i < count; i++) { - xo_open_instance("entry"); - - char name[80]; - snprintf(name, sizeof(name), "xx-%08u", i); - - xo_emitr("{ke:name/%hs}", name); - - xo_emitr("{t:inode/%*ju} ", 3, 12); - xo_emitr("{t:blocks/%*jd} ", 4, 1234); - - xo_emitr("{t:mode/%s}{e:mode_octal/%03o} {t:links/%*ju} {t:user/%-*s} {t:group/%-*s} ", - "mode", 0660, 2, (uintmax_t) 12, - 4, "phil", 4, "phil"); - - - xo_emitr("{e:type/%s}", "regular"); - - xo_emitr("{:flags/%-*s} ", 3, "123"); - xo_emitr("{t:label/%-*s} ", 4, "1234"); - printsize("size", 5, 12345); - printtime("modify-time", 1644355825); - - xo_emitr("{dk:name/%hs}", name); - - xo_close_instance("entry"); - xo_emit("\n"); - } - - xo_close_list("entry"); - - xo_emit("{Lwc:hits}{:hits/%ld}\n", xo_retain_get_hits()); - - xo_close_container("data"); - xo_close_container_h(NULL, "top"); - - xo_finish(); - - return 0; -} |