Libdoc working

Doesn't set "Run on failure" keyword if robot context isn't loaded.

Author: Hi-Fi

pom.xml

@@ -23,7 +23,7 @@
 		<aspectj.version>1.7.3</aspectj.version>
 		<java.version>1.6</java.version>
 		<xml.doclet.version>1.0.4</xml.doclet.version>
-		<robotframework.version>2.8.3</robotframework.version>
+		<robotframework.version>2.9.1</robotframework.version>
 		<keywords.class>Selenium2Library</keywords.class>
 	</properties>
 
@@ -157,7 +157,7 @@
 				<!-- Integration-Test, build documentation -->
 				<groupId>org.robotframework</groupId>
 				<artifactId>robotframework-maven-plugin</artifactId>
-				<version>1.2</version>
+				<version>1.4.4</version>
 				<executions>
 					<execution>
 						<id>test</id>

src/main/java/com/github/markusbernhardt/selenium2library/Selenium2Library.java

@@ -360,13 +360,13 @@ public Selenium2Library(String timeout, String implicitWait) {
 	 *            Default=Capture Page Screenshot. Optional custom keyword to
 	 *            run on failure.
 	 */
-	public Selenium2Library(String timeout, String implicitWait, String runOnFailure) {
+	public Selenium2Library(String timeout, String implicitWait, String keywordToRunOnFailure) {
 		super();
 		addKeywordPattern(KEYWORD_PATTERN);
 		createKeywordFactory(); // => init annotations
 		browserManagement.setSeleniumTimeout(timeout);
 		browserManagement.setSeleniumImplicitWait(implicitWait);
-		this.runOnFailure.registerKeywordToRunOnFailure(runOnFailure);
+		runOnFailure.registerKeywordToRunOnFailure(keywordToRunOnFailure);
 	}
 
 	// ##############################
@@ -510,6 +510,7 @@ public String getKeywordDocumentation(String keywordName) {
 	}
 
 	public static Selenium2Library getLibraryInstance() throws ScriptException {
+		System.out.println("Testi");
 		ScriptEngine engine = new ScriptEngineManager().getEngineByName("python");
 		engine.put("library", "Selenium2Library");
 		engine.eval("from robot.libraries.BuiltIn import BuiltIn");

src/main/java/com/github/markusbernhardt/selenium2library/keywords/RunOnFailure.java

@@ -99,7 +99,7 @@ public String registerKeywordToRunOnFailure(String keyword) {
 		@Override
 		protected PythonInterpreter initialValue() {
 			PythonInterpreter pythonInterpreter = new PythonInterpreter();
-			pythonInterpreter.exec("from robot.libraries import BuiltIn; BUILTIN = BuiltIn.BuiltIn();");
+			pythonInterpreter.exec("from robot.libraries.BuiltIn import BuiltIn; from robot.running.context import EXECUTION_CONTEXTS; BIN = BuiltIn();");
 			return pythonInterpreter;
 		}
 	};
@@ -111,10 +111,13 @@ public void runOnFailure() {
 		if (runningOnFailureRoutine) {
 			return;
 		}
-		runningOnFailureRoutine = true;
+		if(runOnFailurePythonInterpreter.get().eval("EXECUTION_CONTEXTS.current").toString().equals("None")) {
+			return;
+		}
+		
 		try {
 			runOnFailurePythonInterpreter.get().exec(
-					String.format("BUILTIN.run_keyword('%s')",
+					String.format("BIN.run_keyword('%s')",
 							runOnFailureKeyword.replace("'", "\\'").replace("\n", "\\n")));
 		} catch (RuntimeException r) {
 			logging.warn(String.format("Keyword '%s' could not be run on failure%s", runOnFailureKeyword,