Consolidate result data
This commit is contained in:
@@ -30,7 +30,8 @@ def test_extractPersonFromRow():
|
||||
'lastName': 'Mustermann',
|
||||
'name': 'Max Mustermann',
|
||||
'club': 'TSC Entenhausen',
|
||||
'id': None
|
||||
'id': None,
|
||||
'group': None
|
||||
}
|
||||
assert person.__dict__ == expected
|
||||
|
||||
@@ -40,8 +41,63 @@ def test_extractCompetitionFromRow():
|
||||
expected = {
|
||||
'dance': 'Rumba',
|
||||
'class_': 'Adv.',
|
||||
'group': 'Kin',
|
||||
'place': '2',
|
||||
'placeTo': '2',
|
||||
'id': 2
|
||||
}
|
||||
assert person.__dict__ == expected
|
||||
|
||||
def test_combineRowsByPerson():
|
||||
rows = [
|
||||
worker.ResultRow('Max', 'Mustermann', 'TSC Entenhausen', '2', 'Kin', 'Adv.', 'Cha Cha', '-', '-'),
|
||||
worker.ResultRow('Max', 'Mustermann', 'TSC Entenhausen', '2', 'Kin', 'Adv.', 'Rumba', '2', '2'),
|
||||
worker.ResultRow('Max', 'Mustermann', 'TSC Entenhausen', '2', 'Kin', 'Beg.', 'Jive', '1', '1'),
|
||||
worker.ResultRow('Maxime', 'Musterfrau', '1. SC Entenhausen', '1', 'Kin', 'Adv.', 'Rumba', '1', '1')
|
||||
]
|
||||
dataWorker = worker.DataWorker()
|
||||
result = dataWorker.combineRowsByPerson(rows)
|
||||
expected = {
|
||||
worker.ResultPerson('Max', 'Mustermann', 'TSC Entenhausen'): [
|
||||
worker.CompetitionResult('Rumba', 'Kin', 'Adv.', '2', '2', '2'),
|
||||
worker.CompetitionResult('Jive', 'Kin', 'Beg.', '1', '1', '2')
|
||||
],
|
||||
worker.ResultPerson('Maxime', 'Musterfrau', '1. SC Entenhausen'): [
|
||||
worker.CompetitionResult('Rumba', 'Kin', 'Adv.', '1', '1', '1')
|
||||
]
|
||||
}
|
||||
assert result == expected
|
||||
|
||||
def test_checkUniqueIds_True():
|
||||
person1 = worker.ResultPerson('Max', 'Mustermann', 'TSC Entenhausen')
|
||||
person2 = worker.ResultPerson('Maxime', 'Musterfrau', '1. SC Entenhausen')
|
||||
data = {
|
||||
person1: [
|
||||
worker.CompetitionResult('Rumba', 'Kin', 'Adv.', '2', '2', 2),
|
||||
worker.CompetitionResult('Jive', 'Kin', 'Beg.', '1', '1', 2)
|
||||
],
|
||||
person2: [
|
||||
worker.CompetitionResult('Rumba', 'Kin', 'Adv.', '1', '1', 1)
|
||||
]
|
||||
}
|
||||
dataWorker = worker.DataWorker()
|
||||
assert dataWorker.checkUniqueIds(data) == True
|
||||
assert person1.id == 2
|
||||
assert person2.id == 1
|
||||
|
||||
def test_checkUniqueIds_True():
|
||||
person1 = worker.ResultPerson('Max', 'Mustermann', 'TSC Entenhausen')
|
||||
person2 = worker.ResultPerson('Maxime', 'Musterfrau', '1. SC Entenhausen')
|
||||
data = {
|
||||
person1: [
|
||||
worker.CompetitionResult('Rumba', 'Kin', 'Adv.', '2', '2', 2),
|
||||
worker.CompetitionResult('Jive', 'Kin', 'Beg.', '1', '1', 3)
|
||||
],
|
||||
person2: [
|
||||
worker.CompetitionResult('Rumba', 'Kin', 'Adv.', '1', '1', 1)
|
||||
]
|
||||
}
|
||||
dataWorker = worker.DataWorker()
|
||||
assert dataWorker.checkUniqueIds(data) == False
|
||||
assert person1.id == None
|
||||
assert person2.id == 1
|
||||
|
||||
Reference in New Issue
Block a user