From 446f106c90490e9b02b2e5f7d19aabe816422f54 Mon Sep 17 00:00:00 2001 From: David Hughes Date: Thu, 8 Sep 2016 11:54:56 +0100 Subject: [PATCH] unittests: removed ...vec2d.py and amended ...pdfviewer.py --- unittests/test_lib_pdfviewer_pdfviewer.py | 15 ++- unittests/test_lib_pdfviewer_vec2d.py | 122 ---------------------- 2 files changed, 7 insertions(+), 130 deletions(-) delete mode 100644 unittests/test_lib_pdfviewer_vec2d.py diff --git a/unittests/test_lib_pdfviewer_pdfviewer.py b/unittests/test_lib_pdfviewer_pdfviewer.py index 326110b8..710efa1d 100644 --- a/unittests/test_lib_pdfviewer_pdfviewer.py +++ b/unittests/test_lib_pdfviewer_pdfviewer.py @@ -8,7 +8,7 @@ try: from wx.lib.pdfviewer import pdfViewer, pdfButtonPanel havePyPDF = True except ImportError: - havePyPDF = False # Assume an import error is due to missing pyPdf + havePyPDF = False # Assume neither PyMuPDF nor PyPDF2 found dataDir = os.path.join(os.path.dirname(__file__), "data") samplePdf = os.path.join(dataDir, "sample.pdf") @@ -18,19 +18,19 @@ samplePdf = os.path.join(dataDir, "sample.pdf") @unittest.skipIf('wxMac' in wx.PlatformInfo or 'wxGTK' in wx.PlatformInfo, 'test is crashing on Mac and GTK...') class lib_pdfviewer_pdfviewer_Tests(wtc.WidgetTestCase): - - @unittest.skipIf(not havePyPDF, "pyPdf required") + + @unittest.skipIf(not havePyPDF, "PyMuPDF or PyPDF2 required") def test_lib_pdfviewer_pdfviewerButtonPanelCtor(self): bp = pdfButtonPanel(self.frame, wx.NewId(), wx.DefaultPosition, wx.DefaultSize, 0) - @unittest.skipIf(not havePyPDF, "pyPdf required") + @unittest.skipIf(not havePyPDF, "PyMuPDF or PyPDF2 required") def test_lib_pdfviewer_pdfviewerPdfViewerCtor(self): pv = pdfViewer(self.frame, wx.NewId(), wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.VSCROLL|wx.SUNKEN_BORDER) - @unittest.skipIf(not havePyPDF, "pyPdf required") + @unittest.skipIf(not havePyPDF, "PyMuPDF or PyPDF2 required") def test_lib_pdfviewer_loadFile(self): paneCont = sc.SizedPanel(self.frame) @@ -40,16 +40,15 @@ class lib_pdfviewer_pdfviewer_Tests(wtc.WidgetTestCase): self.viewer = pdfViewer(paneCont, wx.NewId(), wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.VSCROLL|wx.SUNKEN_BORDER) - self.viewer.UsePrintDirect = False self.viewer.SetSizerProps(expand=True, proportion=1) # introduce buttonpanel and viewer to each other self.buttonpanel.viewer = self.viewer self.viewer.buttonpanel = self.buttonpanel - + self.viewer.LoadFile(samplePdf) self.waitFor(500) - + #--------------------------------------------------------------------------- if __name__ == '__main__': diff --git a/unittests/test_lib_pdfviewer_vec2d.py b/unittests/test_lib_pdfviewer_vec2d.py deleted file mode 100644 index 37b2fa91..00000000 --- a/unittests/test_lib_pdfviewer_vec2d.py +++ /dev/null @@ -1,122 +0,0 @@ -import unittest -from unittests import wtc -import pickle - -from wx.lib.pdfviewer.vec2d import vec2d - -#--------------------------------------------------------------------------- - -class lib_pdfviewer_vec2d_Tests(wtc.WidgetTestCase): - - def test_lib_pdfviewer_vec2d_CreationAndAccess(self): - v = vec2d(111,222) - self.assertTrue(v.x == 111 and v.y == 222) - v.x = 333 - v[1] = 444 - self.assertTrue(v[0] == 333 and v[1] == 444) - - def test_lib_pdfviewer_vec2d_Math(self): - v = vec2d(111,222) - self.assertEqual(v + 1, vec2d(112,223)) - self.assertTrue(v - 2 == [109,220]) - self.assertTrue(v * 3 == (333,666)) - self.assertTrue(v / 2.0 == vec2d(55.5, 111)) - self.assertTrue(v // 2 == (55, 111)) - self.assertTrue(v ** vec2d(2,3) == [12321, 10941048]) - self.assertTrue(v + [-11, 78] == vec2d(100, 300)) - self.assertTrue(v // [11,2] == [10,111]) - - def test_lib_pdfviewer_vec2d_ReverseMath(self): - v = vec2d(111,222) - self.assertTrue(1 + v == vec2d(112,223)) - self.assertTrue(2 - v == [-109,-220]) - self.assertTrue(3 * v == (333,666)) - self.assertTrue([222,999] // v == [2,4]) - self.assertTrue([111,222] ** vec2d(2,3) == [12321, 10941048]) - self.assertTrue([-11, 78] + v == vec2d(100, 300)) - - def test_lib_pdfviewer_vec2d_Unary(self): - v = vec2d(111,222) - v = -v - self.assertTrue(v == [-111,-222]) - v = abs(v) - self.assertTrue(v == [111,222]) - - def test_lib_pdfviewer_vec2d_Length(self): - v = vec2d(3,4) - self.assertTrue(v.length == 5) - self.assertTrue(v.get_length_sqrd() == 25) - self.assertTrue(v.normalize_return_length() == 5) - self.assertTrue(v.length == 1) - v.length = 5 - self.assertTrue(v == vec2d(3,4)) - v2 = vec2d(10, -2) - self.assertTrue(v.get_distance(v2) == (v - v2).get_length()) - - def test_lib_pdfviewer_vec2d_Angles(self): - v = vec2d(0, 3) - self.assertEqual(v.angle, 90) - v2 = vec2d(v) - v.rotate(-90) - self.assertEqual(v.get_angle_between(v2), 90) - v2.angle -= 90 - self.assertEqual(v.length, v2.length) - self.assertEqual(v2.angle, 0) - self.assertEqual(v2, [3, 0]) - self.assertTrue((v - v2).length < .00001) - self.assertEqual(v.length, v2.length) - v2.rotate(300) - self.assertAlmostEqual(v.get_angle_between(v2), -60) - v2.rotate(v2.get_angle_between(v)) - angle = v.get_angle_between(v2) - self.assertAlmostEqual(v.get_angle_between(v2), 0) - - def test_lib_pdfviewer_vec2d_HighLevel(self): - basis0 = vec2d(5.0, 0) - basis1 = vec2d(0, .5) - v = vec2d(10, 1) - self.assertTrue(v.convert_to_basis(basis0, basis1) == [2, 2]) - self.assertTrue(v.projection(basis0) == (10, 0)) - self.assertTrue(basis0.dot(basis1) == 0) - - def test_lib_pdfviewer_vec2d_Cross(self): - lhs = vec2d(1, .5) - rhs = vec2d(4,6) - self.assertTrue(lhs.cross(rhs) == 4) - - def test_lib_pdfviewer_vec2d_Comparison(self): - int_vec = vec2d(3, -2) - flt_vec = vec2d(3.0, -2.0) - zero_vec = vec2d(0, 0) - self.assertTrue(int_vec == flt_vec) - self.assertTrue(int_vec != zero_vec) - self.assertTrue((flt_vec == zero_vec) == False) - self.assertTrue((flt_vec != int_vec) == False) - self.assertTrue(int_vec == (3, -2)) - self.assertTrue(int_vec != [0, 0]) - self.assertTrue(int_vec != 5) - self.assertTrue(int_vec != [3, -2, -5]) - - def test_lib_pdfviewer_vec2d_Inplace(self): - inplace_vec = vec2d(5, 13) - inplace_ref = inplace_vec - inplace_src = vec2d(inplace_vec) - inplace_vec *= .5 - inplace_vec += .5 - inplace_vec //= (3, 6) - inplace_vec += vec2d(-1, -1) - alternate = (inplace_src*.5 + .5) // vec2d(3,6) + [-1, -1] - self.assertEqual(inplace_vec, inplace_ref) - self.assertEqual(inplace_vec, alternate) - - def test_lib_pdfviewer_vec2d_Pickle(self): - testvec = vec2d(5, .3) - testvec_str = pickle.dumps(testvec) - loaded_vec = pickle.loads(testvec_str) - self.assertEqual(testvec, loaded_vec) - - -#--------------------------------------------------------------------------- - -if __name__ == '__main__': - unittest.main()