Skip to content

Commit 668fcd4

Browse files
PrimozGodecPrimozGodec
committed
SQL test_filter replace RowInstance with Instance
1 parent e09156b commit 668fcd4

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎Orange/tests/sql/test_filter.py‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import unittest
55

6-
from Orange.data.sql.table import SqlTable, SqlRowInstance
7-
from Orange.data import filter, domain
6+
from Orange.data.sql.table import SqlTable
7+
from Orange.data import filter, domain, Instance
88
from Orange.tests.sql.base import DataBaseTest as dbt
99

1010

@@ -368,7 +368,7 @@ def test_filter_string_is_defined(self):
368368
filtered_data = filter.Values(conditions=[
369369
filter.FilterString(-1, filter.FilterString.IsDefined)
370370
])(self.table)
371-
correct_data = [SqlRowInstance(filtered_data.domain, row)
371+
correct_data = [Instance(filtered_data.domain, row)
372372
for row in self.data if row[0] is not None]
373373

374374
self.assertEqual(len(filtered_data), len(correct_data))
@@ -379,7 +379,7 @@ def test_filter_string_equal(self):
379379
filtered_data = filter.Values(conditions=[
380380
filter.FilterString(-1, filter.FilterString.Equal, 'in')
381381
])(self.table)
382-
correct_data = [SqlRowInstance(filtered_data.domain, row)
382+
correct_data = [Instance(filtered_data.domain, row)
383383
for row in self.data if row[0] == 'in']
384384

385385
self.assertEqual(len(filtered_data), len(correct_data))
@@ -391,7 +391,7 @@ def test_filter_string_equal_case_insensitive_value(self):
391391
filter.FilterString(-1, filter.FilterString.Equal, 'In',
392392
case_sensitive=False)
393393
])(self.table)
394-
correct_data = [SqlRowInstance(filtered_data.domain, row)
394+
correct_data = [Instance(filtered_data.domain, row)
395395
for row in self.data if row[0] == 'in']
396396

397397
self.assertEqual(len(filtered_data), len(correct_data))
@@ -403,7 +403,7 @@ def test_filter_string_equal_case_insensitive_data(self):
403403
filter.FilterString(-1, filter.FilterString.Equal, 'donec',
404404
case_sensitive=False)
405405
])(self.table)
406-
correct_data = [SqlRowInstance(filtered_data.domain, row)
406+
correct_data = [Instance(filtered_data.domain, row)
407407
for row in self.data if row[0] == 'Donec']
408408

409409
self.assertEqual(len(filtered_data), len(correct_data))
@@ -414,7 +414,7 @@ def test_filter_string_not_equal(self):
414414
filtered_data = filter.Values(conditions=[
415415
filter.FilterString(-1, filter.FilterString.NotEqual, 'in')
416416
])(self.table)
417-
correct_data = [SqlRowInstance(filtered_data.domain, row)
417+
correct_data = [Instance(filtered_data.domain, row)
418418
for row in self.data if row[0] != 'in']
419419

420420
self.assertEqual(len(filtered_data), len(correct_data))
@@ -426,7 +426,7 @@ def test_filter_string_not_equal_case_insensitive_value(self):
426426
filter.FilterString(-1, filter.FilterString.NotEqual, 'In',
427427
case_sensitive=False)
428428
])(self.table)
429-
correct_data = [SqlRowInstance(filtered_data.domain, row)
429+
correct_data = [Instance(filtered_data.domain, row)
430430
for row in self.data if row[0] != 'in']
431431

432432
self.assertEqual(len(filtered_data), len(correct_data))
@@ -438,7 +438,7 @@ def test_filter_string_not_equal_case_insensitive_data(self):
438438
filter.FilterString(-1, filter.FilterString.NotEqual, 'donec',
439439
case_sensitive=False)
440440
])(self.table)
441-
correct_data = [SqlRowInstance(filtered_data.domain, row)
441+
correct_data = [Instance(filtered_data.domain, row)
442442
for row in self.data if row[0] != 'Donec']
443443

444444
self.assertEqual(len(filtered_data), len(correct_data))
@@ -449,7 +449,7 @@ def test_filter_string_less(self):
449449
filtered_data = filter.Values(conditions=[
450450
filter.FilterString(-1, filter.FilterString.Less, 'A')
451451
])(self.table)
452-
correct_data = [SqlRowInstance(filtered_data.domain, row)
452+
correct_data = [Instance(filtered_data.domain, row)
453453
for row in self.data
454454
if row[0] is not None and row[0] < 'A']
455455

@@ -462,7 +462,7 @@ def test_filter_string_less_case_insensitive_value(self):
462462
filter.FilterString(-1, filter.FilterString.Less, 'In',
463463
case_sensitive=False)
464464
])(self.table)
465-
correct_data = [SqlRowInstance(filtered_data.domain, row)
465+
correct_data = [Instance(filtered_data.domain, row)
466466
for row in self.data
467467
if row[0] is not None and row[0].lower() < 'in']
468468

@@ -475,7 +475,7 @@ def test_filter_string_less_case_insensitive_data(self):
475475
filter.FilterString(-1, filter.FilterString.Less, 'donec',
476476
case_sensitive=False)
477477
])(self.table)
478-
correct_data = [SqlRowInstance(filtered_data.domain, row)
478+
correct_data = [Instance(filtered_data.domain, row)
479479
for row in self.data
480480
if row[0] is not None and row[0].lower() < 'donec']
481481

@@ -487,7 +487,7 @@ def test_filter_string_less_equal(self):
487487
filtered_data = filter.Values(conditions=[
488488
filter.FilterString(-1, filter.FilterString.LessEqual, 'A')
489489
])(self.table)
490-
correct_data = [SqlRowInstance(filtered_data.domain, row)
490+
correct_data = [Instance(filtered_data.domain, row)
491491
for row in self.data
492492
if row[0] is not None and row[0] <= 'A']
493493

@@ -500,7 +500,7 @@ def test_filter_string_less_equal_case_insensitive_value(self):
500500
filter.FilterString(-1, filter.FilterString.LessEqual, 'In',
501501
case_sensitive=False)
502502
])(self.table)
503-
correct_data = [SqlRowInstance(filtered_data.domain, row)
503+
correct_data = [Instance(filtered_data.domain, row)
504504
for row in self.data
505505
if row[0] is not None and row[0].lower() <= 'in']
506506

@@ -513,7 +513,7 @@ def test_filter_string_less_equal_case_insensitive_data(self):
513513
filter.FilterString(-1, filter.FilterString.LessEqual, 'donec',
514514
case_sensitive=False)
515515
])(self.table)
516-
correct_data = [SqlRowInstance(filtered_data.domain, row)
516+
correct_data = [Instance(filtered_data.domain, row)
517517
for row in self.data
518518
if row[0] is not None and row[0].lower() <= 'donec']
519519

@@ -525,7 +525,7 @@ def test_filter_string_greater(self):
525525
filtered_data = filter.Values(conditions=[
526526
filter.FilterString(-1, filter.FilterString.Greater, 'volutpat')
527527
])(self.table)
528-
correct_data = [SqlRowInstance(filtered_data.domain, row)
528+
correct_data = [Instance(filtered_data.domain, row)
529529
for row in self.data
530530
if row[0] is not None and row[0] > 'volutpat']
531531

@@ -538,7 +538,7 @@ def test_filter_string_greater_case_insensitive_value(self):
538538
filter.FilterString(-1, filter.FilterString.Greater, 'In',
539539
case_sensitive=False)
540540
])(self.table)
541-
correct_data = [SqlRowInstance(filtered_data.domain, row)
541+
correct_data = [Instance(filtered_data.domain, row)
542542
for row in self.data
543543
if row[0] is not None and row[0].lower() > 'in']
544544

@@ -551,7 +551,7 @@ def test_filter_string_greater_case_insensitive_data(self):
551551
filter.FilterString(-1, filter.FilterString.Greater, 'donec',
552552
case_sensitive=False)
553553
])(self.table)
554-
correct_data = [SqlRowInstance(filtered_data.domain, row)
554+
correct_data = [Instance(filtered_data.domain, row)
555555
for row in self.data
556556
if row[0] is not None and row[0].lower() > 'donec']
557557

@@ -563,7 +563,7 @@ def test_filter_string_greater_equal(self):
563563
filtered_data = filter.Values(conditions=[
564564
filter.FilterString(-1, filter.FilterString.GreaterEqual, 'volutpat')
565565
])(self.table)
566-
correct_data = [SqlRowInstance(filtered_data.domain, row)
566+
correct_data = [Instance(filtered_data.domain, row)
567567
for row in self.data
568568
if row[0] is not None and row[0] >= 'volutpat']
569569

@@ -576,7 +576,7 @@ def test_filter_string_greater_equal_case_insensitive_value(self):
576576
filter.FilterString(-1, filter.FilterString.GreaterEqual, 'In',
577577
case_sensitive=False)
578578
])(self.table)
579-
correct_data = [SqlRowInstance(filtered_data.domain, row)
579+
correct_data = [Instance(filtered_data.domain, row)
580580
for row in self.data
581581
if row[0] is not None and row[0].lower() >= 'in']
582582

@@ -589,7 +589,7 @@ def test_filter_string_greater_equal_case_insensitive_data(self):
589589
filter.FilterString(-1, filter.FilterString.GreaterEqual, 'donec',
590590
case_sensitive=False)
591591
])(self.table)
592-
correct_data = [SqlRowInstance(filtered_data.domain, row)
592+
correct_data = [Instance(filtered_data.domain, row)
593593
for row in self.data
594594
if row[0] is not None and row[0].lower() >= 'donec']
595595

@@ -601,7 +601,7 @@ def test_filter_string_between(self):
601601
filtered_data = filter.Values(conditions=[
602602
filter.FilterString(-1, filter.FilterString.Between, 'a', 'c')
603603
])(self.table)
604-
correct_data = [SqlRowInstance(filtered_data.domain, row)
604+
correct_data = [Instance(filtered_data.domain, row)
605605
for row in self.data
606606
if row[0] is not None and 'a' <= row[0] <= 'c']
607607

@@ -614,7 +614,7 @@ def test_filter_string_between_case_insensitive_value(self):
614614
filter.FilterString(-1, filter.FilterString.Between, 'I', 'O',
615615
case_sensitive=False)
616616
])(self.table)
617-
correct_data = [SqlRowInstance(filtered_data.domain, row)
617+
correct_data = [Instance(filtered_data.domain, row)
618618
for row in self.data
619619
if row[0] is not None and 'i' < row[0].lower() <= 'o']
620620

@@ -627,7 +627,7 @@ def test_filter_string_between_case_insensitive_data(self):
627627
filter.FilterString(-1, filter.FilterString.Between, 'i', 'O',
628628
case_sensitive=False)
629629
])(self.table)
630-
correct_data = [SqlRowInstance(filtered_data.domain, row)
630+
correct_data = [Instance(filtered_data.domain, row)
631631
for row in self.data
632632
if row[0] is not None and 'i' <= row[0].lower() <= 'o']
633633

@@ -639,7 +639,7 @@ def test_filter_string_contains(self):
639639
filtered_data = filter.Values(conditions=[
640640
filter.FilterString(-1, filter.FilterString.Contains, 'et')
641641
])(self.table)
642-
correct_data = [SqlRowInstance(filtered_data.domain, row)
642+
correct_data = [Instance(filtered_data.domain, row)
643643
for row in self.data
644644
if row[0] is not None and 'et' in row[0]]
645645

@@ -652,7 +652,7 @@ def test_filter_string_contains_case_insensitive_value(self):
652652
filter.FilterString(-1, filter.FilterString.Contains, 'eT',
653653
case_sensitive=False)
654654
])(self.table)
655-
correct_data = [SqlRowInstance(filtered_data.domain, row)
655+
correct_data = [Instance(filtered_data.domain, row)
656656
for row in self.data
657657
if row[0] is not None and 'et' in row[0].lower()]
658658

@@ -665,7 +665,7 @@ def test_filter_string_contains_case_insensitive_data(self):
665665
filter.FilterString(-1, filter.FilterString.Contains, 'do',
666666
case_sensitive=False)
667667
])(self.table)
668-
correct_data = [SqlRowInstance(filtered_data.domain, row)
668+
correct_data = [Instance(filtered_data.domain, row)
669669
for row in self.data
670670
if row[0] is not None and 'do' in row[0].lower()]
671671

@@ -677,7 +677,7 @@ def test_filter_string_outside(self):
677677
filtered_data = filter.Values(conditions=[
678678
filter.FilterString(-1, filter.FilterString.Outside, 'am', 'di')
679679
])(self.table)
680-
correct_data = [SqlRowInstance(filtered_data.domain, row)
680+
correct_data = [Instance(filtered_data.domain, row)
681681
for row in self.data
682682
if row[0] is not None and not 'am' < row[0] < 'di']
683683

@@ -690,7 +690,7 @@ def test_filter_string_outside_case_insensitive(self):
690690
filter.FilterString(-1, filter.FilterString.Outside, 'd', 'k',
691691
case_sensitive=False)
692692
])(self.table)
693-
correct_data = [SqlRowInstance(filtered_data.domain, row)
693+
correct_data = [Instance(filtered_data.domain, row)
694694
for row in self.data
695695
if row[0] is not None and not 'd' < row[0].lower() < 'k']
696696

@@ -702,7 +702,7 @@ def test_filter_string_starts_with(self):
702702
filtered_data = filter.Values(conditions=[
703703
filter.FilterString(-1, filter.FilterString.StartsWith, 'D')
704704
])(self.table)
705-
correct_data = [SqlRowInstance(filtered_data.domain, row)
705+
correct_data = [Instance(filtered_data.domain, row)
706706
for row in self.data
707707
if row[0] is not None and row[0].startswith('D')]
708708

@@ -715,7 +715,7 @@ def test_filter_string_starts_with_case_insensitive(self):
715715
filter.FilterString(-1, filter.FilterString.StartsWith, 'D',
716716
case_sensitive=False)
717717
])(self.table)
718-
correct_data = [SqlRowInstance(filtered_data.domain, row)
718+
correct_data = [Instance(filtered_data.domain, row)
719719
for row in self.data
720720
if row[0] is not None
721721
and row[0].lower().startswith('d')]
@@ -728,7 +728,7 @@ def test_filter_string_ends_with(self):
728728
filtered_data = filter.Values(conditions=[
729729
filter.FilterString(-1, filter.FilterString.EndsWith, 's')
730730
])(self.table)
731-
correct_data = [SqlRowInstance(filtered_data.domain, row)
731+
correct_data = [Instance(filtered_data.domain, row)
732732
for row in self.data
733733
if row[0] is not None and row[0].endswith('s')]
734734

@@ -741,7 +741,7 @@ def test_filter_string_ends_with_case_insensitive(self):
741741
filter.FilterString(-1, filter.FilterString.EndsWith, 'S',
742742
case_sensitive=False)
743743
])(self.table)
744-
correct_data = [SqlRowInstance(filtered_data.domain, row)
744+
correct_data = [Instance(filtered_data.domain, row)
745745
for row in self.data
746746
if row[0] is not None
747747
and row[0].lower().endswith('s')]
@@ -754,7 +754,7 @@ def test_filter_string_list(self):
754754
filtered_data = filter.Values(conditions=[
755755
filter.FilterStringList(-1, ['et', 'in'])
756756
])(self.table)
757-
correct_data = [SqlRowInstance(filtered_data.domain, row)
757+
correct_data = [Instance(filtered_data.domain, row)
758758
for row in self.data if row[0] in ['et', 'in']]
759759

760760
self.assertEqual(len(filtered_data), len(correct_data))
@@ -765,7 +765,7 @@ def test_filter_string_list_case_insensitive_value(self):
765765
filtered_data = filter.Values(conditions=[
766766
filter.FilterStringList(-1, ['Et', 'In'], case_sensitive=False)
767767
])(self.table)
768-
correct_data = [SqlRowInstance(filtered_data.domain, row)
768+
correct_data = [Instance(filtered_data.domain, row)
769769
for row in self.data if row[0] in ['et', 'in']]
770770

771771
self.assertEqual(len(filtered_data), len(correct_data))
@@ -776,7 +776,7 @@ def test_filter_string_list_case_insensitive_data(self):
776776
filtered_data = filter.Values(conditions=[
777777
filter.FilterStringList(-1, ['donec'], case_sensitive=False)
778778
])(self.table)
779-
correct_data = [SqlRowInstance(filtered_data.domain, row)
779+
correct_data = [Instance(filtered_data.domain, row)
780780
for row in self.data if row[0] in ['Donec']]
781781

782782
self.assertEqual(len(filtered_data), len(correct_data))

0 commit comments

Comments
 (0)