unit test and refactor database.py #619

SRomansky · 2014-10-06T23:40:30Z

Updates to tests/framework/test_database.py and framework/database.py.

Replaced test_database.py unittest references with pytest references
Removed test methods that checked the return type of database functions
Added test methods that checked the return values of database functions
Modified database functions to handle python strings properly
Added bound values to the add_presentation and update_presentation database functions.
Removed dummy record inserted by default.

Related gh484

dideler · 2014-10-07T17:35:04Z

There's some style errors, see the Travis build.

SRomansky · 2014-10-07T20:25:24Z

Fixed.

mtomwing · 2014-10-08T00:54:55Z

FWIW, you can flake8 on your own machine before committing to avoid things like that.

SRomansky · 2014-10-08T02:57:23Z

Thanks mtomwing, that will save some time in the future.

mtomwing · 2014-10-10T06:37:25Z

src/freeseer/tests/framework/test_database.py

+
+    talk_ids = db.get_talk_ids()
+    talk_id_count = 0
+    while(talk_ids.next()):


This ain't C.

while condition: ...

Fixed the while loops. I will try to catch up to this Python while it opens doors.

dideler · 2014-10-10T23:23:12Z

src/freeseer/tests/framework/test_database.py

+    assert talk_ids.first()
+    talk_id_record = talk_ids.record()
+    talk_id = talk_ids.value(talk_id_record.indexOf('id')).toString()
+    assert talk_id == '1'


Might as well use FIRST_TALK_ID here.

mtomwing · 2014-10-10T23:50:42Z

I'm not a big fan of FIRST_TALK_ID. We know that the very first record added will have an id of 1, so it's better to be explicit about it. It's better to be DAMP in tests rather than DRY (with some exceptions).

SRomansky · 2014-10-15T18:18:46Z

Removed FIRST_TALK_ID in favor of '1' and removed the string concatenation from os.path.join calls.

mtomwing · 2014-10-16T01:23:59Z

.coveragerc

@@ -1,2 +1,3 @@
 [run]
 omit = freeseer/tests/*
+


Revert this change.

mtomwing · 2014-10-18T08:15:33Z

src/freeseer/framework/database.py

+        ''')
+
+    def __drop_presentation(self):
+        QtSql.QSqlQuery('DROP TABLE presentations')


These functions definitely do not go here as they're only used by tests. I'd also question whether they're actually required at all?

Migrated to the testing function. I thought of a way to get them out of database.py yesterday but was not able to get back to the keyboard.

If there are end users running older versions of the client then it could be useful to test that their databases upgrade correctly when they get a newer version of freeseer? Although I am not sure how many people actually run freeseer with a very old version like 2x

dideler · 2014-11-23T18:08:55Z

src/freeseer/tests/framework/database/test_database.py

+
+    talk_id = db.get_talk_between_dates(presentation.event, presentation.room,
+                                       time_before_presentation, time_after_presentation)
+    assert talk_id == '1'


This test can be improved by inserting more presentations, to make sure it actually filters presentations.

edit: The below test kinda tests that already.

I added another test. I also added another presentation object to this test. I have added a fixme comment to the get_talk_between_dates function since it only returns one presentation id (if there are multiple presentations on the same day which one has its id returned?)

…o fixtures, need to give them better names, refactored helper function name, added logging, added more tests.)

…d to presentation for comparing records to presentations. Started refactoring failure and presentation references.

SRomansky · 2014-11-25T00:30:43Z

@dideler
The behaviour also occurs with the prepared statements (I had written both originally to double check that).

SRomansky · 2014-11-25T00:32:51Z

@dideler added the __dict__ comparison to failures.py

…ther files.

…ments

SRomansky · 2014-11-25T02:14:53Z

@dideler I will take a look again on Friday+Saturday for refactoring. I know for sure that the presentation fixtures will need to be renamed. There may also be some other little points that can be fixed up as well to be cleaner/clearer.

…__dict__ attribute as well.

dideler · 2014-11-25T15:41:17Z

src/freeseer/tests/framework/database/test_database.py

+
+    talk_ids = db.get_talk_ids()
+    expected_id = 1
+    while(talk_ids.next()):


No parentheses for while.

dideler · 2014-11-25T15:54:04Z

Thanks for the updates. I'll try to do some more review and leave comments before Friday/Saturday.

On a sidenote, this PR is getting huge with the amount of conversations, which makes it slow to load and linking to conversations doesn't work anymore (at least not for me). Might be useful to create a new PR and then reference this one.

SRomansky · 2014-11-25T16:00:40Z

@dideler #670 created.

edit: Not certain how to associate the PR with the other issue though. Ah I made an Issue instead of a PR, oops. The PR creation page doesn't mention creating another PR, only to view the current one associated with the branch. Guess it can be cloned and a PR created from that.

edit3: #671 created

dideler · 2014-11-25T16:29:03Z

Discussion will continue in #671.

P.S. @wigglier the easiest way to open a replacement PR is to close the existing PR first, then open a new one. You shouldn't have to create a new branch in the process.

SRomansky changed the title ~~484 unit test and refactor~~ unit test and refactor database.py Oct 7, 2014

dideler added this to the 2014 Fall - UCOSP milestone Oct 7, 2014

mtomwing reviewed Oct 10, 2014
View reviewed changes

SRomansky force-pushed the 484-unit-test-and-refactor branch from 9c82e20 to 75b3d7b Compare October 10, 2014 22:45

dideler reviewed Oct 10, 2014
View reviewed changes

mtomwing reviewed Oct 16, 2014
View reviewed changes

SRomansky force-pushed the 484-unit-test-and-refactor branch from 187f217 to 8756aad Compare October 18, 2014 05:38

mtomwing reviewed Oct 18, 2014
View reviewed changes

dideler reviewed Nov 23, 2014
View reviewed changes

Started working through the database PR feedback.

ce670f5

SRomansky mentioned this pull request Nov 24, 2014

Construct a new database schema for the presentation table that better handles timestamps #667

Open

Stephen Romansky added 3 commits November 24, 2014 14:28

Committing some work from today (refactored several presentations int…

553ffd0

…o fixtures, need to give them better names, refactored helper function name, added logging, added more tests.)

Removed paranoid assertions. Added presentation equality. Added recor…

47a9f79

…d to presentation for comparing records to presentations. Started refactoring failure and presentation references.

Refactoring

0816b11

Updated the failure comparison operator to use the dict comparison.

0dc24a8

Stephen Romansky added 2 commits November 24, 2014 17:33

Forgot to add this. It allows conftest fixtures to be imported into o…

444b4d1

…ther files.

Added comment I forgot to add earlier WRT the prepared database state…

7fa031b

…ments

Stephen Romansky added 2 commits November 24, 2014 19:18

Fixed the presentation comparison operator such that it now uses the …

3fa29b0

…__dict__ attribute as well.

Fixed relative path from linux convention to multi-platform

6e33eac

dideler reviewed Nov 25, 2014
View reviewed changes

Code feedbacks

c6d56da

SRomansky mentioned this pull request Nov 25, 2014

unit test and refactor database.py part 2 #670

Closed

SRomansky mentioned this pull request Nov 25, 2014

unit test and refactor database.py part 2 #671

Open

dideler closed this Nov 25, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

unit test and refactor database.py #619

unit test and refactor database.py #619

SRomansky commented Oct 6, 2014

dideler commented Oct 7, 2014

SRomansky commented Oct 7, 2014

mtomwing commented Oct 8, 2014

SRomansky commented Oct 8, 2014

mtomwing Oct 10, 2014

dideler Oct 10, 2014

SRomansky Oct 10, 2014

dideler Oct 10, 2014

SRomansky Oct 15, 2014

mtomwing commented Oct 10, 2014

SRomansky commented Oct 15, 2014

mtomwing Oct 16, 2014

SRomansky Oct 16, 2014

mtomwing Oct 18, 2014

SRomansky Oct 18, 2014

SRomansky Oct 18, 2014

dideler Nov 23, 2014

SRomansky Nov 24, 2014

SRomansky commented Nov 25, 2014

SRomansky commented Nov 25, 2014

SRomansky commented Nov 25, 2014

dideler Nov 25, 2014

SRomansky Nov 25, 2014

dideler commented Nov 25, 2014

SRomansky commented Nov 25, 2014

dideler commented Nov 25, 2014

unit test and refactor database.py #619

unit test and refactor database.py #619

Conversation

SRomansky commented Oct 6, 2014

dideler commented Oct 7, 2014

SRomansky commented Oct 7, 2014

mtomwing commented Oct 8, 2014

SRomansky commented Oct 8, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mtomwing commented Oct 10, 2014

SRomansky commented Oct 15, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SRomansky commented Nov 25, 2014

SRomansky commented Nov 25, 2014

SRomansky commented Nov 25, 2014

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dideler commented Nov 25, 2014

SRomansky commented Nov 25, 2014

dideler commented Nov 25, 2014