2 new revisions:
Revision: ccf56a94f0dc
Author: Pekka Klärck
Date: Mon Dec 19 13:25:17 2011
Log: relative imports
http://code.google.com/p/robotframework/source/detail?r=ccf56a94f0dc
Revision: 9ffc7685012e
Author: Pekka Klärck
Date: Mon Dec 19 13:33:30 2011
Log: Fixed test for embedded argument name spaces....
http://code.google.com/p/robotframework/source/detail?r=9ffc7685012e
==============================================================================
Revision: ccf56a94f0dc
Author: Pekka Klärck
Date: Mon Dec 19 13:25:17 2011
Log: relative imports
http://code.google.com/p/robotframework/source/detail?r=ccf56a94f0dc
Modified:
/src/robot/running/userkeyword.py
=======================================
--- /src/robot/running/userkeyword.py Mon Nov 7 04:26:53 2011
+++ /src/robot/running/userkeyword.py Mon Dec 19 13:25:17 2011
@@ -21,11 +21,11 @@
from robot.output import LOGGER
from robot import utils
-from keywords import Keywords
-from fixture import Teardown, KeywordTeardownListener
-from timeouts import KeywordTimeout
-from arguments import UserKeywordArguments
-from runerrors import KeywordRunErrors
+from .keywords import Keywords
+from .fixture import Teardown, KeywordTeardownListener
+from .timeouts import KeywordTimeout
+from .arguments import UserKeywordArguments
+from .runerrors import KeywordRunErrors
class UserLibrary(BaseLibrary):
==============================================================================
Revision: 9ffc7685012e
Author: Pekka Klärck
Date: Mon Dec 19 13:33:30 2011
Log: Fixed test for embedded argument name spaces.
Update issue 988
Status: Done
Cc: pekka.klarck
Reviewing this only a little over month after the fix....
1) The fix itself was simple and solid.
2) The added test was broken because the test was fully the "running"
side (i.e. atest/robot/...) and thus always executed with Python. I
fixed that by moving the original test to the test data side
(i.e. atest/testdata/...) and added a test to verify it on the running
side. I also moved the test into existing embedded_arguments.txt test
suite. We can Mikko go through the atest system f2f tomorrow.
Most importantly this issue is now done.
http://code.google.com/p/robotframework/source/detail?r=9ffc7685012e
Deleted:
/atest/robot/running/embedded_args_namespace.txt
Modified:
/atest/robot/keywords/embedded_arguments.txt
/atest/testdata/keywords/embedded_arguments.txt
=======================================
--- /atest/robot/running/embedded_args_namespace.txt Mon Nov 7 04:27:39
2011
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Settings ***
-Force Tags regression pybot jybot
-
-*** Test Cases ***
-Test
- ${var}= Set Variable hello
- My embedded warrior
- Should be equal ${var} hello
-
-*** Keywords ***
-My embedded ${var}
- Should be equal ${var} warrior
=======================================
--- /atest/robot/keywords/embedded_arguments.txt Mon Jun 27 03:11:20 2011
+++ /atest/robot/keywords/embedded_arguments.txt Mon Dec 19 13:33:30 2011
@@ -16,6 +16,9 @@
Check Log Message ${tc.kws[0].kws[0].msgs[0]} feature-works
Check Log Message ${tc.kws[1].kws[0].msgs[0]} test case-is *executed*
Check Log Message ${tc.kws[2].kws[0].msgs[0]} issue-is about to be
done!
+
+Argument Namespaces with Embedded Arguments
+ Check Test Case ${TEST NAME}
Embedded Arguments as Variables
${tc} = Check Test Case ${TEST NAME}
=======================================
--- /atest/testdata/keywords/embedded_arguments.txt Mon Jun 27 03:21:15 2011
+++ /atest/testdata/keywords/embedded_arguments.txt Mon Dec 19 13:33:30 2011
@@ -14,6 +14,11 @@
When this "test case" is *executed*
Then this "issue" is about to be done!
+Argument Namespaces with Embedded Arguments
+ ${var}= Set Variable hello
+ My embedded warrior
+ Should be equal ${var} hello
+
Embedded Arguments as Variables
${name} ${item} = User ${42} Selects ${EMPTY} From Webshop
Should Be Equal ${name}-${item} 42-
@@ -135,6 +140,9 @@
${prefix:Given|When|Then} this "${item}" ${no good name for this arg ...}
Log ${item}-${no good name for this arg ...}
+
+My embedded ${var}
+ Should be equal ${var} warrior
${x:x} gets ${y:\w} from the ${z:.}
Should Be Equal ${x}-${y}-${z} x-y-z
