diff options
Diffstat (limited to 'tests/QtCore')
| -rw-r--r-- | tests/QtCore/python_conversion.py | 8 | ||||
| -rw-r--r-- | tests/QtCore/qdatetime_test.py | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/QtCore/python_conversion.py b/tests/QtCore/python_conversion.py index 43dfccfb6..aab440dd7 100644 --- a/tests/QtCore/python_conversion.py +++ b/tests/QtCore/python_conversion.py @@ -18,17 +18,17 @@ class TestDateTimeConversions (unittest.TestCase): self.assertEqual(date, other.toPython()) def testQTime(self): - time = datetime.time(11, 14, 00, 01) + time = datetime.time(11, 14, 00, 1000) other = QTime(time) self.assertEqual(time.hour, other.hour()) self.assertEqual(time.minute, other.minute()) self.assertEqual(time.second, other.second()) - self.assertEqual(time.microsecond, other.msec()) + self.assertEqual(time.microsecond/1000, other.msec()) self.assertEqual(time, other.toPython()) def testQDateTime(self): - dateTime = datetime.datetime(2010, 04, 23, 11, 14, 00, 01) + dateTime = datetime.datetime(2010, 04, 23, 11, 14, 00, 1000) other = QDateTime(dateTime) otherDate = other.date() @@ -40,7 +40,7 @@ class TestDateTimeConversions (unittest.TestCase): self.assertEqual(dateTime.hour, otherTime.hour()) self.assertEqual(dateTime.minute, otherTime.minute()) self.assertEqual(dateTime.second, otherTime.second()) - self.assertEqual(dateTime.microsecond, otherTime.msec()) + self.assertEqual(dateTime.microsecond/1000, otherTime.msec()) self.assertEqual(dateTime, other.toPython()) diff --git a/tests/QtCore/qdatetime_test.py b/tests/QtCore/qdatetime_test.py index b73247741..ebc9dfbb4 100644 --- a/tests/QtCore/qdatetime_test.py +++ b/tests/QtCore/qdatetime_test.py @@ -6,13 +6,18 @@ from PySide.QtCore import QDateTime, QDate, QTime class TestQDate (unittest.TestCase): def testDateConversion(self): dateTime = QDateTime(QDate(2011, 05, 17), QTime(11, 01, 14, 15)) - dateTimePy = QDateTime(datetime.date(2011, 05, 17), datetime.time(11, 01, 14, 15)) + dateTimePy = QDateTime(datetime.date(2011, 05, 17), datetime.time(11, 01, 14, 15000)) self.assertEqual(dateTime, dateTimePy) def testDateTimeConversion(self): dateTime = QDateTime(QDate(2011, 05, 17), QTime(11, 01, 14, 15)) - dateTimePy = QDateTime(datetime.datetime(2011, 05, 17, 11, 01, 14, 15)) + dateTimePy = QDateTime(datetime.datetime(2011, 05, 17, 11, 01, 14, 15000)) self.assertEqual(dateTime, dateTimePy) + def testDateTimeNow(self): + py = datetime.datetime.now() + qt = QDateTime(py) + self.assertEqual(qt, py) + if __name__ == '__main__': unittest.main() |