##// END OF EJS Templates
[core][tests][inputsplitter] Remove nose
Samuel Gaist -
Show More
@@ -8,8 +8,6 b''
8 import unittest
8 import unittest
9 import sys
9 import sys
10
10
11 import nose.tools as nt
12
13 from IPython.core import inputsplitter as isp
11 from IPython.core import inputsplitter as isp
14 from IPython.core.inputtransformer import InputTransformer
12 from IPython.core.inputtransformer import InputTransformer
15 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
13 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
@@ -98,10 +96,10 b' def test_remove_comments():'
98
96
99 def test_get_input_encoding():
97 def test_get_input_encoding():
100 encoding = isp.get_input_encoding()
98 encoding = isp.get_input_encoding()
101 nt.assert_true(isinstance(encoding, str))
99 assert isinstance(encoding, str)
102 # simple-minded check that at least encoding a simple string works with the
100 # simple-minded check that at least encoding a simple string works with the
103 # encoding we got.
101 # encoding we got.
104 nt.assert_equal(u'test'.encode(encoding), b'test')
102 assert "test".encode(encoding) == b"test"
105
103
106
104
107 class NoInputEncodingTestCase(unittest.TestCase):
105 class NoInputEncodingTestCase(unittest.TestCase):
@@ -419,7 +417,7 b' class IPythonInputTestCase(InputSplitterTestCase):'
419 for lraw, out_t_part in line_pairs:
417 for lraw, out_t_part in line_pairs:
420 if out_t_part is not None:
418 if out_t_part is not None:
421 out_t_parts.append(out_t_part)
419 out_t_parts.append(out_t_part)
422
420
423 if lraw is not None:
421 if lraw is not None:
424 isp.push(lraw)
422 isp.push(lraw)
425 raw_parts.append(lraw)
423 raw_parts.append(lraw)
@@ -442,7 +440,7 b' class IPythonInputTestCase(InputSplitterTestCase):'
442 out = isp.transform_cell(raw)
440 out = isp.transform_cell(raw)
443 # Match ignoring trailing whitespace
441 # Match ignoring trailing whitespace
444 self.assertEqual(out.rstrip(), out_t.rstrip())
442 self.assertEqual(out.rstrip(), out_t.rstrip())
445
443
446 def test_cellmagic_preempt(self):
444 def test_cellmagic_preempt(self):
447 isp = self.isp
445 isp = self.isp
448 for raw, name, line, cell in [
446 for raw, name, line, cell in [
@@ -464,17 +462,17 b' class IPythonInputTestCase(InputSplitterTestCase):'
464 class CommentTransformer(InputTransformer):
462 class CommentTransformer(InputTransformer):
465 def __init__(self):
463 def __init__(self):
466 self._lines = []
464 self._lines = []
467
465
468 def push(self, line):
466 def push(self, line):
469 self._lines.append(line + '#')
467 self._lines.append(line + '#')
470
468
471 def reset(self):
469 def reset(self):
472 text = '\n'.join(self._lines)
470 text = '\n'.join(self._lines)
473 self._lines = []
471 self._lines = []
474 return text
472 return text
475
473
476 isp.physical_line_transforms.insert(0, CommentTransformer())
474 isp.physical_line_transforms.insert(0, CommentTransformer())
477
475
478 for raw, expected in [
476 for raw, expected in [
479 ("a=5", "a=5#"),
477 ("a=5", "a=5#"),
480 ("%ls foo", "get_ipython().run_line_magic(%r, %r)" % (u'ls', u'foo#')),
478 ("%ls foo", "get_ipython().run_line_magic(%r, %r)" % (u'ls', u'foo#')),
@@ -527,38 +525,38 b" if __name__ == '__main__':"
527 # Tests for cell magics support
525 # Tests for cell magics support
528
526
529 def test_last_blank():
527 def test_last_blank():
530 nt.assert_false(isp.last_blank(''))
528 assert isp.last_blank("") is False
531 nt.assert_false(isp.last_blank('abc'))
529 assert isp.last_blank("abc") is False
532 nt.assert_false(isp.last_blank('abc\n'))
530 assert isp.last_blank("abc\n") is False
533 nt.assert_false(isp.last_blank('abc\na'))
531 assert isp.last_blank("abc\na") is False
534
532
535 nt.assert_true(isp.last_blank('\n'))
533 assert isp.last_blank("\n") is True
536 nt.assert_true(isp.last_blank('\n '))
534 assert isp.last_blank("\n ") is True
537 nt.assert_true(isp.last_blank('abc\n '))
535 assert isp.last_blank("abc\n ") is True
538 nt.assert_true(isp.last_blank('abc\n\n'))
536 assert isp.last_blank("abc\n\n") is True
539 nt.assert_true(isp.last_blank('abc\nd\n\n'))
537 assert isp.last_blank("abc\nd\n\n") is True
540 nt.assert_true(isp.last_blank('abc\nd\ne\n\n'))
538 assert isp.last_blank("abc\nd\ne\n\n") is True
541 nt.assert_true(isp.last_blank('abc \n \n \n\n'))
539 assert isp.last_blank("abc \n \n \n\n") is True
542
540
543
541
544 def test_last_two_blanks():
542 def test_last_two_blanks():
545 nt.assert_false(isp.last_two_blanks(''))
543 assert isp.last_two_blanks("") is False
546 nt.assert_false(isp.last_two_blanks('abc'))
544 assert isp.last_two_blanks("abc") is False
547 nt.assert_false(isp.last_two_blanks('abc\n'))
545 assert isp.last_two_blanks("abc\n") is False
548 nt.assert_false(isp.last_two_blanks('abc\n\na'))
546 assert isp.last_two_blanks("abc\n\na") is False
549 nt.assert_false(isp.last_two_blanks('abc\n \n'))
547 assert isp.last_two_blanks("abc\n \n") is False
550 nt.assert_false(isp.last_two_blanks('abc\n\n'))
548 assert isp.last_two_blanks("abc\n\n") is False
551
549
552 nt.assert_true(isp.last_two_blanks('\n\n'))
550 assert isp.last_two_blanks("\n\n") is True
553 nt.assert_true(isp.last_two_blanks('\n\n '))
551 assert isp.last_two_blanks("\n\n ") is True
554 nt.assert_true(isp.last_two_blanks('\n \n'))
552 assert isp.last_two_blanks("\n \n") is True
555 nt.assert_true(isp.last_two_blanks('abc\n\n '))
553 assert isp.last_two_blanks("abc\n\n ") is True
556 nt.assert_true(isp.last_two_blanks('abc\n\n\n'))
554 assert isp.last_two_blanks("abc\n\n\n") is True
557 nt.assert_true(isp.last_two_blanks('abc\n\n \n'))
555 assert isp.last_two_blanks("abc\n\n \n") is True
558 nt.assert_true(isp.last_two_blanks('abc\n\n \n '))
556 assert isp.last_two_blanks("abc\n\n \n ") is True
559 nt.assert_true(isp.last_two_blanks('abc\n\n \n \n'))
557 assert isp.last_two_blanks("abc\n\n \n \n") is True
560 nt.assert_true(isp.last_two_blanks('abc\nd\n\n\n'))
558 assert isp.last_two_blanks("abc\nd\n\n\n") is True
561 nt.assert_true(isp.last_two_blanks('abc\nd\ne\nf\n\n\n'))
559 assert isp.last_two_blanks("abc\nd\ne\nf\n\n\n") is True
562
560
563
561
564 class CellMagicsCommon(object):
562 class CellMagicsCommon(object):
@@ -567,11 +565,11 b' class CellMagicsCommon(object):'
567 src = "%%cellm line\nbody\n"
565 src = "%%cellm line\nbody\n"
568 out = self.sp.transform_cell(src)
566 out = self.sp.transform_cell(src)
569 ref = "get_ipython().run_cell_magic('cellm', 'line', 'body')\n"
567 ref = "get_ipython().run_cell_magic('cellm', 'line', 'body')\n"
570 nt.assert_equal(out, ref)
568 assert out == ref
571
569
572 def test_cellmagic_help(self):
570 def test_cellmagic_help(self):
573 self.sp.push('%%cellm?')
571 self.sp.push('%%cellm?')
574 nt.assert_false(self.sp.push_accepts_more())
572 assert self.sp.push_accepts_more() is False
575
573
576 def tearDown(self):
574 def tearDown(self):
577 self.sp.reset()
575 self.sp.reset()
@@ -582,14 +580,14 b' class CellModeCellMagics(CellMagicsCommon, unittest.TestCase):'
582
580
583 def test_incremental(self):
581 def test_incremental(self):
584 sp = self.sp
582 sp = self.sp
585 sp.push('%%cellm firstline\n')
583 sp.push("%%cellm firstline\n")
586 nt.assert_true(sp.push_accepts_more()) #1
584 assert sp.push_accepts_more() is True # 1
587 sp.push('line2\n')
585 sp.push("line2\n")
588 nt.assert_true(sp.push_accepts_more()) #2
586 assert sp.push_accepts_more() is True # 2
589 sp.push('\n')
587 sp.push("\n")
590 # This should accept a blank line and carry on until the cell is reset
588 # This should accept a blank line and carry on until the cell is reset
591 nt.assert_true(sp.push_accepts_more()) #3
589 assert sp.push_accepts_more() is True # 3
592
590
593 def test_no_strip_coding(self):
591 def test_no_strip_coding(self):
594 src = '\n'.join([
592 src = '\n'.join([
595 '%%writefile foo.py',
593 '%%writefile foo.py',
@@ -597,7 +595,7 b' class CellModeCellMagics(CellMagicsCommon, unittest.TestCase):'
597 'print(u"üñîçø∂é")',
595 'print(u"üñîçø∂é")',
598 ])
596 ])
599 out = self.sp.transform_cell(src)
597 out = self.sp.transform_cell(src)
600 nt.assert_in('# coding: utf-8', out)
598 assert "# coding: utf-8" in out
601
599
602
600
603 class LineModeCellMagics(CellMagicsCommon, unittest.TestCase):
601 class LineModeCellMagics(CellMagicsCommon, unittest.TestCase):
@@ -605,11 +603,12 b' class LineModeCellMagics(CellMagicsCommon, unittest.TestCase):'
605
603
606 def test_incremental(self):
604 def test_incremental(self):
607 sp = self.sp
605 sp = self.sp
608 sp.push('%%cellm line2\n')
606 sp.push("%%cellm line2\n")
609 nt.assert_true(sp.push_accepts_more()) #1
607 assert sp.push_accepts_more() is True # 1
610 sp.push('\n')
608 sp.push("\n")
611 # In this case, a blank line should end the cell magic
609 # In this case, a blank line should end the cell magic
612 nt.assert_false(sp.push_accepts_more()) #2
610 assert sp.push_accepts_more() is False # 2
611
613
612
614 indentation_samples = [
613 indentation_samples = [
615 ('a = 1', 0),
614 ('a = 1', 0),
General Comments 0
You need to be logged in to leave comments. Login now