Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Cleanup and modularize tests in preparation for stream variants. Initial work on stream tests. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | sessions |
Files: | files | file ages | folders |
SHA1: |
c41edbe55e1075446956dc37a1324b9c |
User & Date: | mistachkin 2017-10-12 19:26:02.457 |
Context
2017-10-12
| ||
20:04 | Add stream tests for the CombineWith and Apply methods. check-in: cce9d5de83 user: mistachkin tags: sessions | |
19:26 | Cleanup and modularize tests in preparation for stream variants. Initial work on stream tests. check-in: c41edbe55e user: mistachkin tags: sessions | |
00:03 | Minor test cleanup. check-in: ac526d98e8 user: mistachkin tags: sessions | |
Changes
Changes to Tests/session.eagle.
︙ | ︙ | |||
86 87 88 89 90 91 92 | return [object invoke -flags +NonPublic \ System.Data.SQLite.HelperMethods ToDisplayString $value] } } ############################################################################### | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | return [object invoke -flags +NonPublic \ System.Data.SQLite.HelperMethods ToDisplayString $value] } } ############################################################################### proc createMemoryChangeSetForSession { session } { if {[isObjectHandle $session] && $session ne "null"} then { set byteArray null $session -alias CreateChangeSet byteArray set rawData [createByteArray [arrayToList byteArray]] object removeref $rawData return $rawData } return null } ############################################################################### proc writeRawDataToFile { fileName rawData } { if {[isObjectHandle $rawData] && $rawData ne "null"} then { set stream [object create -alias \ System.IO.FileStream $fileName Create Write] $stream Write $rawData 0 [$rawData Length] $stream Flush; $stream Close return true } return false } ############################################################################### proc openStreamChangeSetForConnection { connection inputFileName outputFileName {varName ""} } { if {[isObjectHandle $connection] && $connection ne "null"} then { if {[string length $varName] > 0} then { upvar 1 $varName array } if {[string length $inputFileName] > 0} then { set array(inputStream) [object create -alias \ System.IO.FileStream $inputFileName Open Read] } else { set array(inputStream) null } if {[string length $outputFileName] > 0} then { set array(outputStream) [object create -alias \ System.IO.FileStream $outputFileName Create Write] } else { set array(outputStream) null } set array(changeSet) [$connection -alias \ CreateChangeSet $array(inputStream) $array(outputStream)] return true } return false } ############################################################################### proc writeStreamChangeSetForSession { session fileName } { if {[isObjectHandle $session] && $session ne "null"} then { set stream [object create -alias \ System.IO.FileStream $fileName Create Write] $session -alias CreateChangeSet $stream $stream Flush; $stream Close return true } return false } ############################################################################### proc changeSetFileToString { connection fileName includeValues } { set result [list] if {[isObjectHandle $connection] && $connection ne "null"} then { if {[openStreamChangeSetForConnection \ $connection $fileName "" changeSet]} then { return [changeSetToString $changeSet(changeSet) $includeValues] } } return $result } ############################################################################### proc metadataItemToString { item includeValues } { set result [list] if {[isObjectHandle $item] && $item ne "null"} then { |
︙ | ︙ | |||
158 159 160 161 162 163 164 | } ############################################################################### proc matchSession { connection session expr } { if {[isObjectHandle $session] && $session ne "null"} then { if {![$session IsEmpty]} then { | | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 | } ############################################################################### proc matchSession { connection session expr } { if {[isObjectHandle $session] && $session ne "null"} then { if {![$session IsEmpty]} then { set rawData [createMemoryChangeSetForSession $session] object removeref $rawData if {[isObjectHandle $rawData] && $rawData ne "null"} then { return [matchChangeSet [set changeSet \ [$connection -alias CreateChangeSet $rawData]] $expr] } } |
︙ | ︙ | |||
255 256 257 258 259 260 261 | $session AttachTable $tableName if {![isObjectHandle $session] || $session eq "null"} then { error "cannot create session" } catch {uplevel 1 $script} | | | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | $session AttachTable $tableName if {![isObjectHandle $session] || $session eq "null"} then { error "cannot create session" } catch {uplevel 1 $script} set rawData [createMemoryChangeSetForSession $session] object removeref $rawData return $rawData } ############################################################################### |
︙ | ︙ | |||
332 333 334 335 336 337 338 | System.Data.SQLite.SQLiteChangeSetConflictResult $result false] return [lindex $::callbackResults end] } ############################################################################### | | | < < | < < | < < | < < < < < < < | | | 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | System.Data.SQLite.SQLiteChangeSetConflictResult $result false] return [lindex $::callbackResults end] } ############################################################################### runTest {test session-1.1 {basic extension usage} -setup { setupDb [set fileName(0) session-1.1.db] set fileName(1) [getChangeSetFileName 1] set fileName(2) [getChangeSetFileName 2] cleanupSomeText } -body { createTheSchema $db main makeSomeChanges $db t1 [list insert insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] set rawData [createMemoryChangeSetForSession $session] object removeref $rawData writeRawDataToFile $fileName(1) $rawData writeStreamChangeSetForSession $session $fileName(2) openStreamChangeSetForConnection $connection $fileName(2) "" changeSet list [expr {[file size $fileName(1)] > 0}] \ [string equal [readFile $fileName(1)] [readFile $fileName(2)]] \ [changeSetToString $changeSet(changeSet) true] } -cleanup { cleanupSomeText unset -nocomplain changeSet rawData byteArray session freeDbConnection unset -nocomplain connection cleanupFile $fileName(2) cleanupFile $fileName(1) |
︙ | ︙ | |||
402 403 404 405 406 407 408 | NumberOfColumns 2 OperationCode Update Indirect False PrimaryKeyColumns {[True,\ False]} OldValue 0 2 NewValue 0 <nullObject> ConflictValue 0 <nullObject>\ OldValue 1 {"inserted: Foxtrot Golf Hotel India Juliet"} NewValue 1 {"updated:\ Papa Quebec Romeo Sierra Tango"} ConflictValue 1 <nullObject>} {TableName t1\ NumberOfColumns 2 OperationCode Insert Indirect False PrimaryKeyColumns {[True,\ False]} OldValue 0 <nullObject> NewValue 0 3 ConflictValue 0 <nullObject>\ OldValue 1 <nullObject> NewValue 1 {"inserted: Kilo Lima Mike November Oscar"}\ | | | | | | < | | > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | < < < | | | < < < < < < < | < < < < | | | | | | | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | NumberOfColumns 2 OperationCode Update Indirect False PrimaryKeyColumns {[True,\ False]} OldValue 0 2 NewValue 0 <nullObject> ConflictValue 0 <nullObject>\ OldValue 1 {"inserted: Foxtrot Golf Hotel India Juliet"} NewValue 1 {"updated:\ Papa Quebec Romeo Sierra Tango"} ConflictValue 1 <nullObject>} {TableName t1\ NumberOfColumns 2 OperationCode Insert Indirect False PrimaryKeyColumns {[True,\ False]} OldValue 0 <nullObject> NewValue 0 3 ConflictValue 0 <nullObject>\ OldValue 1 <nullObject> NewValue 1 {"inserted: Kilo Lima Mike November Oscar"}\ ConflictValue 1 <nullObject>}}}} ############################################################################### runTest {test session-1.2.1 {change set read/write/enum (memory)} -setup { setupDb [set fileName session-1.2.1.db] cleanupSomeText } -body { createTheSchema $db main makeSomeChanges $db t1 [list insert insert insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] set rawData [createMemoryChangeSetForSession $session] object removeref $rawData set changeSet(1) [$connection -alias CreateChangeSet $rawData] set changeSet(2) [$changeSet(1) -alias Invert] list [changeSetToString $changeSet(2) true] } -cleanup { cleanupSomeText unset -nocomplain changeSet rawData byteArray session freeDbConnection unset -nocomplain connection cleanupDb $fileName unset -nocomplain db fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite SQLiteInterop\ defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \ {{{TableName t1 NumberOfColumns 2 OperationCode Insert Indirect False\ PrimaryKeyColumns {[True, False]} OldValue 0 <nullObject> NewValue 0 1\ ConflictValue 0 <nullObject> OldValue 1 <nullObject> NewValue 1 {"inserted:\ Alpha Bravo Charlie Delta Echo"} ConflictValue 1 <nullObject>} {TableName t1\ NumberOfColumns 2 OperationCode Update Indirect False PrimaryKeyColumns {[True,\ False]} OldValue 0 2 NewValue 0 <nullObject> ConflictValue 0 <nullObject>\ OldValue 1 {"updated: Uniform Victor Whiskey X-ray Yankee"} NewValue 1\ {"inserted: Foxtrot Golf Hotel India Juliet"} ConflictValue 1 <nullObject>}\ {TableName t1 NumberOfColumns 2 OperationCode Update Indirect False\ PrimaryKeyColumns {[True, False]} OldValue 0 3 NewValue 0 <nullObject>\ ConflictValue 0 <nullObject> OldValue 1 {"updated: Uniform Victor Whiskey X-ray\ Yankee"} NewValue 1 {"inserted: Kilo Lima Mike November Oscar"} ConflictValue 1\ <nullObject>} {TableName t1 NumberOfColumns 2 OperationCode Delete Indirect\ False PrimaryKeyColumns {[True, False]} OldValue 0 4 NewValue 0 <nullObject>\ ConflictValue 0 <nullObject> OldValue 1 {"inserted: Papa Quebec Romeo Sierra\ Tango"} NewValue 1 <nullObject> ConflictValue 1 <nullObject>}}}} ############################################################################### runTest {test session-1.2.2 {change set read/write/enum (stream)} -setup { setupDb [set fileName(0) session-1.2.2.db] set fileName(1) [getChangeSetFileName 1] set fileName(2) [getChangeSetFileName 2] cleanupSomeText } -body { createTheSchema $db main makeSomeChanges $db t1 [list insert insert insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] writeStreamChangeSetForSession $session $fileName(1) openStreamChangeSetForConnection \ $connection $fileName(1) $fileName(2) changeSet $changeSet(changeSet) -alias Invert; unset changeSet list [changeSetFileToString $connection $fileName(2) true] } -cleanup { cleanupSomeText unset -nocomplain changeSet byteArray session freeDbConnection unset -nocomplain connection cleanupDb $fileName(0) unset -nocomplain db fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite SQLiteInterop\ defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result \ {{{TableName t1 NumberOfColumns 2 OperationCode Insert Indirect False\ PrimaryKeyColumns {[True, False]} OldValue 0 <nullObject> NewValue 0 1\ ConflictValue 0 <nullObject> OldValue 1 <nullObject> NewValue 1 {"inserted:\ Alpha Bravo Charlie Delta Echo"} ConflictValue 1 <nullObject>} {TableName t1\ NumberOfColumns 2 OperationCode Update Indirect False PrimaryKeyColumns {[True,\ False]} OldValue 0 2 NewValue 0 <nullObject> ConflictValue 0 <nullObject>\ OldValue 1 {"updated: Uniform Victor Whiskey X-ray Yankee"} NewValue 1\ {"inserted: Foxtrot Golf Hotel India Juliet"} ConflictValue 1 <nullObject>}\ {TableName t1 NumberOfColumns 2 OperationCode Update Indirect False\ PrimaryKeyColumns {[True, False]} OldValue 0 3 NewValue 0 <nullObject>\ ConflictValue 0 <nullObject> OldValue 1 {"updated: Uniform Victor Whiskey X-ray\ Yankee"} NewValue 1 {"inserted: Kilo Lima Mike November Oscar"} ConflictValue 1\ <nullObject>} {TableName t1 NumberOfColumns 2 OperationCode Delete Indirect\ False PrimaryKeyColumns {[True, False]} OldValue 0 4 NewValue 0 <nullObject>\ ConflictValue 0 <nullObject> OldValue 1 {"inserted: Papa Quebec Romeo Sierra\ Tango"} NewValue 1 <nullObject> ConflictValue 1 <nullObject>}}}} ############################################################################### runTest {test session-1.3 {enabled/disabled state} -setup { setupDb [set fileName session-1.3.db] cleanupSomeText } -body { createTheSchema $db main makeSomeChanges $db t1 [list insert] |
︙ | ︙ | |||
500 501 502 503 504 505 506 | $session SetToDisabled lappend result IsEnabled [$session IsEnabled] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] | | | | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 | $session SetToDisabled lappend result IsEnabled [$session IsEnabled] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] object removeref $rawData lappend result Length [$rawData Length] $session SetToEnabled lappend result IsEnabled [$session IsEnabled] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] object removeref $rawData set changeSet(1) [$connection -alias CreateChangeSet $rawData] lappend result [changeSetToString $changeSet(1) false] } -cleanup { cleanupSomeText |
︙ | ︙ | |||
537 538 539 540 541 542 543 | defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result {IsEnabled\ True IsEnabled True IsEnabled False IsEmpty True Length 0 IsEnabled True\ IsEmpty False {{TableName t1 NumberOfColumns 2 OperationCode Insert Indirect\ False PrimaryKeyColumns {[True, False]}}}}} ############################################################################### | | | 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 | defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result {IsEnabled\ True IsEnabled True IsEnabled False IsEmpty True Length 0 IsEnabled True\ IsEmpty False {{TableName t1 NumberOfColumns 2 OperationCode Insert Indirect\ False PrimaryKeyColumns {[True, False]}}}}} ############################################################################### runTest {test session-1.4 {direct/indirect state} -setup { setupDb [set fileName session-1.4.db] cleanupSomeText } -body { createTheSchema $db main makeSomeChanges $db t1 [list insert] |
︙ | ︙ | |||
559 560 561 562 563 564 565 | $session SetToIndirect lappend result IsIndirect [$session IsIndirect] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] | | | | 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 | $session SetToIndirect lappend result IsIndirect [$session IsIndirect] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] object removeref $rawData $session SetToDirect lappend result IsIndirect [$session IsIndirect] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] object removeref $rawData set changeSet(1) [$connection -alias CreateChangeSet $rawData] lappend result [changeSetToString $changeSet(1) false] } -cleanup { cleanupSomeText |
︙ | ︙ | |||
595 596 597 598 599 600 601 | {IsIndirect False IsIndirect False IsIndirect True IsEmpty False IsIndirect\ False IsEmpty False {{TableName t1 NumberOfColumns 2 OperationCode Insert\ Indirect True PrimaryKeyColumns {[True, False]}} {TableName t1 NumberOfColumns\ 2 OperationCode Insert Indirect False PrimaryKeyColumns {[True, False]}}}}} ############################################################################### | | | 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 | {IsIndirect False IsIndirect False IsIndirect True IsEmpty False IsIndirect\ False IsEmpty False {{TableName t1 NumberOfColumns 2 OperationCode Insert\ Indirect True PrimaryKeyColumns {[True, False]}} {TableName t1 NumberOfColumns\ 2 OperationCode Insert Indirect False PrimaryKeyColumns {[True, False]}}}}} ############################################################################### runTest {test session-1.5 {table filter} -setup { setupDb [set fileName session-1.5.db] cleanupSomeText } -body { createTheSchema $db main makeSomeChanges $db t1 [list insert] |
︙ | ︙ | |||
792 793 794 795 796 797 798 | rename captureChangeSetRawData "" rename makeSomeChanges "" rename createTheSchema "" rename matchChangeSet "" rename matchSession "" rename changeSetToString "" rename metadataItemToString "" | > | > > > | 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 | rename captureChangeSetRawData "" rename makeSomeChanges "" rename createTheSchema "" rename matchChangeSet "" rename matchSession "" rename changeSetToString "" rename metadataItemToString "" rename changeSetFileToString "" rename writeStreamChangeSetForSession "" rename openStreamChangeSetForConnection "" rename writeRawDataToFile "" rename createMemoryChangeSetForSession "" rename forDisplay "" rename cleanupSomeText "" rename getSomeText "" ############################################################################### runSQLiteTestEpilogue runTestEpilogue |