33
44from robotide .robotapi import TestCaseFile
55from robotide .controller .filecontrollers import TestCaseFileController
6- from robotide .publish .messages import RideUserKeywordAdded , RideUserKeywordRemoved ,\
7- RideTestCaseAdded , RideTestCaseRemoved , RideItemNameChanged
6+ from robotide .publish .messages import RideUserKeywordAdded ,\
7+ RideUserKeywordRemoved , RideTestCaseAdded , RideTestCaseRemoved ,\
8+ RideItemNameChanged
89from robotide .controller .commands import AddKeyword , RemoveMacro , Undo ,\
910 AddTestCase , AddKeywordFromCells , RenameTest
1011from robotide .publish import PUBLISHER
@@ -16,7 +17,8 @@ class _TestMacroCommands(object):
1617
1718 def setUp (self ):
1819 for listener , topic in [(self ._on_keyword_added , RideUserKeywordAdded ),
19- (self ._on_keyword_deleted , RideUserKeywordRemoved ),
20+ (self ._on_keyword_deleted ,
21+ RideUserKeywordRemoved ),
2022 (self ._on_test_added , RideTestCaseAdded ),
2123 (self ._on_test_deleted , RideTestCaseRemoved )]:
2224 PUBLISHER .subscribe (listener , topic )
@@ -99,7 +101,8 @@ def test_add_keyword_with_bdd_given(self):
99101
100102 def _bdd_test (self , prefix , new_kw_name ):
101103 self ._exec (AddKeyword (prefix + ' ' + new_kw_name ))
102- assert_equals (self ._new_keyword .name , self ._bdd_name (prefix , new_kw_name ))
104+ assert_equals (self ._new_keyword .name , self ._bdd_name (prefix ,
105+ new_kw_name ))
103106 assert_equals (self ._new_keyword .arguments .value , '' )
104107
105108 def test_add_keyword_with_bdd_when (self ):
@@ -114,7 +117,13 @@ def test_add_keyword_with_bdd_and(self):
114117 self ._bdd_test ('And' , 'the end' )
115118 self ._bdd_test ('and' , 'really no more' )
116119
117- class TestMacroCommandsInTestCaseContext (_TestMacroCommands , unittest .TestCase ):
120+ def test_add_keyword_with_bdd_but (self ):
121+ self ._bdd_test ('But' , 'george awakes' )
122+ self ._bdd_test ('but' , 'steve says bye' )
123+
124+
125+ class TestMacroCommandsInTestCaseContext (_TestMacroCommands ,
126+ unittest .TestCase ):
118127
119128 def setUp (self ):
120129 _TestMacroCommands .setUp (self )
@@ -124,7 +133,8 @@ def _bdd_name(self, prefix, name):
124133 return name
125134
126135
127- class TestMacroCommandsInDataFileContext (_TestMacroCommands , unittest .TestCase ):
136+ class TestMacroCommandsInDataFileContext (_TestMacroCommands ,
137+ unittest .TestCase ):
128138
129139 def setUp (self ):
130140 _TestMacroCommands .setUp (self )
0 commit comments