Skip to content

Commit 51fabce

Browse files
onyxfishonyxfish
committed
Add column name/type checks to join tests.
1 parent 93ae724 commit 51fabce

File tree

1 file changed

+100
-0
lines changed

1 file changed

+100
-0
lines changed

‎tests/test_table.py

+100
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,18 @@ def test_join(self):
989989
self.assertEqual(len(new_table.rows), 3)
990990
self.assertEqual(len(new_table.columns), 5)
991991

992+
self.assertEqual(new_table.columns[0].name, 'one')
993+
self.assertEqual(new_table.columns[1].name, 'two')
994+
self.assertEqual(new_table.columns[2].name, 'three')
995+
self.assertEqual(new_table.columns[3].name, 'five')
996+
self.assertEqual(new_table.columns[4].name, 'six')
997+
998+
self.assertIsInstance(new_table.columns[0].data_type, Number)
999+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1000+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1001+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1002+
self.assertIsInstance(new_table.columns[4].data_type, Text)
1003+
9921004
self.assertSequenceEqual(new_table.rows[0], (1, 4, 'a', 4, 'a'))
9931005
self.assertSequenceEqual(new_table.rows[1], (2, 3, 'b', 3, 'b'))
9941006
self.assertSequenceEqual(new_table.rows[2], (None, 2, 'c', 2, 'c'))
@@ -999,6 +1011,18 @@ def test_join2(self):
9991011
self.assertEqual(len(new_table.rows), 3)
10001012
self.assertEqual(len(new_table.columns), 5)
10011013

1014+
self.assertEqual(new_table.columns[0].name, 'one')
1015+
self.assertEqual(new_table.columns[1].name, 'two')
1016+
self.assertEqual(new_table.columns[2].name, 'three')
1017+
self.assertEqual(new_table.columns[3].name, 'four')
1018+
self.assertEqual(new_table.columns[4].name, 'six')
1019+
1020+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1021+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1022+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1023+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1024+
self.assertIsInstance(new_table.columns[4].data_type, Text)
1025+
10021026
self.assertSequenceEqual(new_table.rows[0], (1, 4, 'a', None, None))
10031027
self.assertSequenceEqual(new_table.rows[1], (2, 3, 'b', None, 'c'))
10041028
self.assertSequenceEqual(new_table.rows[2], (None, 2, 'c', None, None))
@@ -1017,6 +1041,18 @@ def test_join_same_column_name(self):
10171041
self.assertEqual(len(new_table.rows), 3)
10181042
self.assertEqual(len(new_table.columns), 5)
10191043

1044+
self.assertEqual(new_table.columns[0].name, 'one')
1045+
self.assertEqual(new_table.columns[1].name, 'two')
1046+
self.assertEqual(new_table.columns[2].name, 'three')
1047+
self.assertEqual(new_table.columns[3].name, 'four')
1048+
self.assertEqual(new_table.columns[4].name, 'six')
1049+
1050+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1051+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1052+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1053+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1054+
self.assertIsInstance(new_table.columns[4].data_type, Text)
1055+
10201056
self.assertSequenceEqual(new_table.rows[0], (1, 4, 'a', None, None))
10211057
self.assertSequenceEqual(new_table.rows[1], (2, 3, 'b', None, 'c'))
10221058
self.assertSequenceEqual(new_table.rows[2], (None, 2, 'c', None, None))
@@ -1031,6 +1067,20 @@ def test_join_func(self):
10311067
self.assertEqual(len(new_table.rows), 3)
10321068
self.assertEqual(len(new_table.columns), 6)
10331069

1070+
self.assertEqual(new_table.columns[0].name, 'one')
1071+
self.assertEqual(new_table.columns[1].name, 'two')
1072+
self.assertEqual(new_table.columns[2].name, 'three')
1073+
self.assertEqual(new_table.columns[3].name, 'four')
1074+
self.assertEqual(new_table.columns[4].name, 'five')
1075+
self.assertEqual(new_table.columns[5].name, 'six')
1076+
1077+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1078+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1079+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1080+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1081+
self.assertIsInstance(new_table.columns[4].data_type, Number)
1082+
self.assertIsInstance(new_table.columns[5].data_type, Text)
1083+
10341084
self.assertSequenceEqual(new_table.rows[0], (1, 4, 'a', 1, 4, 'a'))
10351085
self.assertSequenceEqual(new_table.rows[1], (2, 3, 'b', 2, 3, 'b'))
10361086
self.assertSequenceEqual(new_table.rows[2], (None, 2, 'c', None, 2, 'c'))
@@ -1045,6 +1095,18 @@ def test_inner_join(self):
10451095
self.assertEqual(len(new_table.rows), 3)
10461096
self.assertEqual(len(new_table.columns), 5)
10471097

1098+
self.assertEqual(new_table.columns[0].name, 'one')
1099+
self.assertEqual(new_table.columns[1].name, 'two')
1100+
self.assertEqual(new_table.columns[2].name, 'three')
1101+
self.assertEqual(new_table.columns[3].name, 'five')
1102+
self.assertEqual(new_table.columns[4].name, 'six')
1103+
1104+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1105+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1106+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1107+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1108+
self.assertIsInstance(new_table.columns[4].data_type, Text)
1109+
10481110
self.assertSequenceEqual(new_table.rows[0], (1, 4, 'a', 4, 'a'))
10491111
self.assertSequenceEqual(new_table.rows[1], (2, 3, 'b', 3, 'b'))
10501112
self.assertSequenceEqual(new_table.rows[2], (None, 2, 'c', 2, 'c'))
@@ -1055,6 +1117,18 @@ def test_inner_join2(self):
10551117
self.assertEqual(len(new_table.rows), 1)
10561118
self.assertEqual(len(new_table.columns), 5)
10571119

1120+
self.assertEqual(new_table.columns[0].name, 'one')
1121+
self.assertEqual(new_table.columns[1].name, 'two')
1122+
self.assertEqual(new_table.columns[2].name, 'three')
1123+
self.assertEqual(new_table.columns[3].name, 'four')
1124+
self.assertEqual(new_table.columns[4].name, 'six')
1125+
1126+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1127+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1128+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1129+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1130+
self.assertIsInstance(new_table.columns[4].data_type, Text)
1131+
10581132
self.assertSequenceEqual(new_table.rows[0], (2, 3, 'b', None, 'c'))
10591133

10601134
def test_inner_join_same_column_name(self):
@@ -1071,6 +1145,18 @@ def test_inner_join_same_column_name(self):
10711145
self.assertEqual(len(new_table.rows), 1)
10721146
self.assertEqual(len(new_table.columns), 5)
10731147

1148+
self.assertEqual(new_table.columns[0].name, 'one')
1149+
self.assertEqual(new_table.columns[1].name, 'two')
1150+
self.assertEqual(new_table.columns[2].name, 'three')
1151+
self.assertEqual(new_table.columns[3].name, 'four')
1152+
self.assertEqual(new_table.columns[4].name, 'six')
1153+
1154+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1155+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1156+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1157+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1158+
self.assertIsInstance(new_table.columns[4].data_type, Text)
1159+
10741160
self.assertSequenceEqual(new_table.rows[0], (2, 3, 'b', None, 'c'))
10751161

10761162
def test_inner_join_func(self):
@@ -1084,6 +1170,20 @@ def test_inner_join_func(self):
10841170
self.assertEqual(len(new_table.rows), 3)
10851171
self.assertEqual(len(new_table.columns), 6)
10861172

1173+
self.assertEqual(new_table.columns[0].name, 'one')
1174+
self.assertEqual(new_table.columns[1].name, 'two')
1175+
self.assertEqual(new_table.columns[2].name, 'three')
1176+
self.assertEqual(new_table.columns[3].name, 'four')
1177+
self.assertEqual(new_table.columns[4].name, 'five')
1178+
self.assertEqual(new_table.columns[5].name, 'six')
1179+
1180+
self.assertIsInstance(new_table.columns[0].data_type, Number)
1181+
self.assertIsInstance(new_table.columns[1].data_type, Number)
1182+
self.assertIsInstance(new_table.columns[2].data_type, Text)
1183+
self.assertIsInstance(new_table.columns[3].data_type, Number)
1184+
self.assertIsInstance(new_table.columns[4].data_type, Number)
1185+
self.assertIsInstance(new_table.columns[5].data_type, Text)
1186+
10871187
def test_join_with_row_names(self):
10881188
left = Table(self.left_rows, self.left_columns, row_names='three')
10891189
new_table = left.join(self.right, 'one', 'four')

0 commit comments

Comments
 (0)