Skip to content

Commit 65a1ae9

Browse files
committed
TST: drop test of PDFGuiControl.importPdffit2Script
Add vanilla test of `PDFGuiControl.__init__`.
1 parent 90d1fdb commit 65a1ae9

5 files changed

Lines changed: 9 additions & 289 deletions

File tree

src/diffpy/pdfgui/tests/TestPDFGuiControl.py

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,32 @@
1919

2020
import unittest
2121

22-
from diffpy.pdfgui.control.controlerrors import ControlRuntimeError
23-
from diffpy.pdfgui.tests.testutils import datafile
22+
from diffpy.pdfgui.control.pdfguicontrol import PDFGuiControl
2423

24+
# ----------------------------------------------------------------------------
2525

26-
##############################################################################
2726
class TestPDFGuiControl(unittest.TestCase):
2827
"""test methods of PDFGuiControl"""
2928

3029
def setUp(self):
31-
from diffpy.pdfgui.control.pdfguicontrol import PDFGuiControl
3230
self.control = PDFGuiControl()
3331
return
3432

3533
def tearDown(self):
3634
del self.control
3735
return
3836

39-
@unittest.skip("feature planned for removal")
40-
def test_importPdffit2Script(self):
41-
"""check PDFGuiControl.importPdffit2Script()
42-
"""
43-
self.assertEqual(0, len(self.control.fits))
44-
fgoodNi = datafile('goodNiScript.py')
45-
ftwophases = datafile('CdSe15_twophases.py')
46-
fbadNi1 = datafile('badNiScript1.py')
47-
fbadNi2 = datafile('badNiScript2.py')
48-
newfits = self.control.importPdffit2Script(fgoodNi)
49-
self.assertEqual(1, len(newfits))
50-
self.assertEqual(1, len(self.control.fits))
51-
newfits = self.control.importPdffit2Script(ftwophases)
52-
self.assertEqual(5, len(newfits))
53-
self.assertEqual(6, len(self.control.fits))
54-
self.assertRaises(ControlRuntimeError,
55-
self.control.importPdffit2Script, fbadNi1)
56-
self.assertRaises(ControlRuntimeError,
57-
self.control.importPdffit2Script, fbadNi2)
37+
38+
def test___init__(self):
39+
"check PDFGuiControl.__init__"
40+
self.assertEqual('', self.control.journal)
41+
self.assertIsNone(self.control.projfile)
5842
return
5943

6044
# End of class TestPDFGuiControl
6145

46+
# ----------------------------------------------------------------------------
47+
6248
if __name__ == '__main__':
6349
unittest.main()
6450

src/diffpy/pdfgui/tests/testdata/CdSe15_twophases.py

Lines changed: 0 additions & 176 deletions
This file was deleted.

src/diffpy/pdfgui/tests/testdata/badNiScript1.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/diffpy/pdfgui/tests/testdata/badNiScript2.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/diffpy/pdfgui/tests/testdata/goodNiScript.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)