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