Skip to content

Commit 99c77ae

Browse files
TobianasTobianas
committed
Adjust the expected JsTree output
Since we have changed the logic of JsTree, the expected output for deviations needs to be changed. JIRA:LIGHTY-230 Signed-off-by: tobias.pobocik <tobias.pobocik@pantheon.tech>
1 parent 64019a6 commit 99c77ae

File tree

9 files changed

+538
-104
lines changed

9 files changed

+538
-104
lines changed

‎src/test/resources/integration/compare/integrationTestJsTree.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name test_model@2020-12-03, namespace test:testspace, prefix test </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-test_model" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-test_model" class="btn btn-info">Collapse All</button>
97+
<table id="basic-test_model" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -462,17 +462,14 @@
462462

463463
$.SimpleTreeTable = SimpleTreeTable;
464464

465-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
466-
expander: $('#expander'),
467-
collapser: $('#collapser')
465+
//AddTableLogic
466+
$(document).ready(function () {
467+
$('#basic-test_model').simpleTreeTable({
468+
expander: $('#expander-test_model'),
469+
collapser: $('#collapser-test_model')
468470
});
469-
470-
$('#collapsed').simpleTreeTable({
471-
opened: 'none',
472-
});
473-
$('#collapsed').simpleTreeTable({
474-
margin: 25
475471
});
472+
476473
</script>
477474
</body>
478475
</html>

‎src/test/resources/out/compare/connectionOrientedOam.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name ietf-connection-oriented-oam@2019-04-16, namespace urn:ietf:params:xml:ns:yang:ietf-connection-oriented-oam, prefix co-oam </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-ietf-connection-oriented-oam" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-ietf-connection-oriented-oam" class="btn btn-info">Collapse All</button>
97+
<table id="basic-ietf-connection-oriented-oam" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -660,17 +660,14 @@
660660

661661
$.SimpleTreeTable = SimpleTreeTable;
662662

663-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
664-
expander: $('#expander'),
665-
collapser: $('#collapser')
663+
//AddTableLogic
664+
$(document).ready(function () {
665+
$('#basic-ietf-connection-oriented-oam').simpleTreeTable({
666+
expander: $('#expander-ietf-connection-oriented-oam'),
667+
collapser: $('#collapser-ietf-connection-oriented-oam')
666668
});
667-
668-
$('#collapsed').simpleTreeTable({
669-
opened: 'none',
670-
});
671-
$('#collapsed').simpleTreeTable({
672-
margin: 25
673669
});
670+
674671
</script>
675672
</body>
676673
</html>

‎src/test/resources/out/compare/interfaces.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name ietf-interfaces@2018-02-20, namespace urn:ietf:params:xml:ns:yang:ietf-interfaces, prefix if </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-ietf-interfaces" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-ietf-interfaces" class="btn btn-info">Collapse All</button>
97+
<table id="basic-ietf-interfaces" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -853,17 +853,14 @@
853853

854854
$.SimpleTreeTable = SimpleTreeTable;
855855

856-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
857-
expander: $('#expander'),
858-
collapser: $('#collapser')
856+
//AddTableLogic
857+
$(document).ready(function () {
858+
$('#basic-ietf-interfaces').simpleTreeTable({
859+
expander: $('#expander-ietf-interfaces'),
860+
collapser: $('#collapser-ietf-interfaces')
859861
});
860-
861-
$('#collapsed').simpleTreeTable({
862-
opened: 'none',
863-
});
864-
$('#collapsed').simpleTreeTable({
865-
margin: 25
866862
});
863+
867864
</script>
868865
</body>
869866
</html>

‎src/test/resources/out/compare/ip.html‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name ietf-ip@2018-02-22, namespace urn:ietf:params:xml:ns:yang:ietf-ip, prefix ip </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-ietf-ip" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-ietf-ip" class="btn btn-info">Collapse All</button>
97+
<table id="basic-ietf-ip" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -574,17 +574,14 @@
574574

575575
$.SimpleTreeTable = SimpleTreeTable;
576576

577-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
578-
expander: $('#expander'),
579-
collapser: $('#collapser')
577+
//AddTableLogic
578+
$(document).ready(function () {
579+
$('#basic-ietf-ip').simpleTreeTable({
580+
expander: $('#expander-ietf-ip'),
581+
collapser: $('#collapser-ietf-ip')
580582
});
581-
582-
$('#collapsed').simpleTreeTable({
583-
opened: 'none',
584-
});
585-
$('#collapsed').simpleTreeTable({
586-
margin: 25
587583
});
584+
588585
</script>
589586
</body>
590587
</html>

‎src/test/resources/out/compare/moduleDeviation.html‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name deviation@2022-11-30, namespace urn:ietf:params:xml:ns:yang:deviation, prefix dev </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-deviation" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-deviation" class="btn btn-info">Collapse All</button>
97+
<table id="basic-deviation" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -104,9 +104,9 @@
104104
</table>
105105
</div>
106106
<div> <b> module name model@2022-11-30, namespace urn:ietf:params:xml:ns:yang:model, prefix mo </b></div><div>
107-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
108-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
109-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
107+
<button type="button" id="expander-model" class="btn btn-danger">Expand All</button>
108+
<button type="button" id="collapser-model" class="btn btn-info">Collapse All</button>
109+
<table id="basic-model" class="table table-bordered table-striped simple-tree-table">
110110
<th> element </th>
111111
<th> schema </th>
112112
<th> type </th>
@@ -467,17 +467,18 @@
467467

468468
$.SimpleTreeTable = SimpleTreeTable;
469469

470-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
471-
expander: $('#expander'),
472-
collapser: $('#collapser')
470+
//AddTableLogic
471+
$(document).ready(function () {
472+
$('#basic-deviation').simpleTreeTable({
473+
expander: $('#expander-deviation'),
474+
collapser: $('#collapser-deviation')
473475
});
474-
475-
$('#collapsed').simpleTreeTable({
476-
opened: 'none',
476+
$('#basic-model').simpleTreeTable({
477+
expander: $('#expander-model'),
478+
collapser: $('#collapser-model')
477479
});
478-
$('#collapsed').simpleTreeTable({
479-
margin: 25
480480
});
481+
481482
</script>
482483
</body>
483484
</html>

‎src/test/resources/out/compare/multipleModules.html‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name ietf-connection-oriented-oam@2019-04-16, namespace urn:ietf:params:xml:ns:yang:ietf-connection-oriented-oam, prefix co-oam </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-ietf-connection-oriented-oam" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-ietf-connection-oriented-oam" class="btn btn-info">Collapse All</button>
97+
<table id="basic-ietf-connection-oriented-oam" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -334,9 +334,9 @@
334334
</table>
335335
</div>
336336
<div> <b> module name ietf-routing@2018-03-13, namespace urn:ietf:params:xml:ns:yang:ietf-routing, prefix rt </b></div><div>
337-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
338-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
339-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
337+
<button type="button" id="expander-ietf-routing" class="btn btn-danger">Expand All</button>
338+
<button type="button" id="collapser-ietf-routing" class="btn btn-info">Collapse All</button>
339+
<table id="basic-ietf-routing" class="table table-bordered table-striped simple-tree-table">
340340
<th> element </th>
341341
<th> schema </th>
342342
<th> type </th>
@@ -916,17 +916,18 @@
916916

917917
$.SimpleTreeTable = SimpleTreeTable;
918918

919-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
920-
expander: $('#expander'),
921-
collapser: $('#collapser')
919+
//AddTableLogic
920+
$(document).ready(function () {
921+
$('#basic-ietf-connection-oriented-oam').simpleTreeTable({
922+
expander: $('#expander-ietf-connection-oriented-oam'),
923+
collapser: $('#collapser-ietf-connection-oriented-oam')
922924
});
923-
924-
$('#collapsed').simpleTreeTable({
925-
opened: 'none',
925+
$('#basic-ietf-routing').simpleTreeTable({
926+
expander: $('#expander-ietf-routing'),
927+
collapser: $('#collapser-ietf-routing')
926928
});
927-
$('#collapsed').simpleTreeTable({
928-
margin: 25
929929
});
930+
930931
</script>
931932
</body>
932-
</html>
933+
</html>

‎src/test/resources/out/compare/routing.html‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name ietf-routing@2018-03-13, namespace urn:ietf:params:xml:ns:yang:ietf-routing, prefix rt </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-ietf-routing" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-ietf-routing" class="btn btn-info">Collapse All</button>
97+
<table id="basic-ietf-routing" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -674,17 +674,14 @@
674674

675675
$.SimpleTreeTable = SimpleTreeTable;
676676

677-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
678-
expander: $('#expander'),
679-
collapser: $('#collapser')
677+
//AddTableLogic
678+
$(document).ready(function () {
679+
$('#basic-ietf-routing').simpleTreeTable({
680+
expander: $('#expander-ietf-routing'),
681+
collapser: $('#collapser-ietf-routing')
680682
});
681-
682-
$('#collapsed').simpleTreeTable({
683-
opened: 'none',
684-
});
685-
$('#collapsed').simpleTreeTable({
686-
margin: 25
687683
});
684+
688685
</script>
689686
</body>
690-
</html>
687+
</html>

‎src/test/resources/out/compare/testModel.html‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
</style>
9393
</head><body>
9494
<div> <b> module name test_model@2020-12-03, namespace test:testspace, prefix test </b></div><div>
95-
<button type="button" id="expander" class="btn btn-danger">Expand All</button>
96-
<button type="button" id="collapser" class="btn btn-info">Collapse All</button>
97-
<table id="basic" class="table table-bordered table-striped simple-tree-table">
95+
<button type="button" id="expander-test_model" class="btn btn-danger">Expand All</button>
96+
<button type="button" id="collapser-test_model" class="btn btn-info">Collapse All</button>
97+
<table id="basic-test_model" class="table table-bordered table-striped simple-tree-table">
9898
<th> element </th>
9999
<th> schema </th>
100100
<th> type </th>
@@ -462,17 +462,14 @@
462462

463463
$.SimpleTreeTable = SimpleTreeTable;
464464

465-
$('.table.table-bordered.table-striped.simple-tree-table').simpleTreeTable({
466-
expander: $('#expander'),
467-
collapser: $('#collapser')
465+
//AddTableLogic
466+
$(document).ready(function () {
467+
$('#basic-test_model').simpleTreeTable({
468+
expander: $('#expander-test_model'),
469+
collapser: $('#collapser-test_model')
468470
});
469-
470-
$('#collapsed').simpleTreeTable({
471-
opened: 'none',
472-
});
473-
$('#collapsed').simpleTreeTable({
474-
margin: 25
475471
});
472+
476473
</script>
477474
</body>
478-
</html>
475+
</html>

0 commit comments

Comments
 (0)