Permalink
Browse files

simplified and cleaned up the test resources

  • Loading branch information...
1 parent 4fed99e commit cfec967e27bcb78c68b67d4f232b3fc6a3ca680e @jussimalinen jussimalinen committed Mar 13, 2013
@@ -1,5 +1,5 @@
*** Settings ***
-Resource remoteapps_resource.txt
+Resource ../resources/remoteapps_resource.txt
Suite Setup Start applications
Suite Teardown Remove Connected File
Library OperatingSystem
@@ -1,6 +1,6 @@
*** Settings ***
Suite Setup Start Simple Application App1
-Resource remoteapps_resource.txt
+Resource ../resources/remoteapps_resource.txt
*** Test Cases ***
Using Application In First Suite
@@ -1,5 +1,5 @@
*** Settings ***
-Resource remoteapps_resource.txt
+Resource ../resources/remoteapps_resource.txt
*** Test Cases ***
Using Application In Second Suite
@@ -1,6 +1,6 @@
*** Settings ***
Test Teardown Close All Applications
-Resource remoteapps_resource.txt
+Resource ../resources/remoteapps_resource.txt
*** Test Cases ***
Using Single Application
@@ -1,6 +1,5 @@
*** Settings ***
-Resource remoteapps_resource.txt
-Resource ../resources/common.txt
+Resource ../resources/remoteapps_resource.txt
*** Test Cases ***
Defining Port To Start Application
@@ -1,7 +1,7 @@
*** Settings ***
Suite Setup startWebstartService
Suite Teardown stopWebstartService
-Resource remoteapps_resource.txt
+Resource ../resources/webstart_resource.txt
Force Tags webstart
*** Test Cases ***
@@ -1,9 +0,0 @@
-import sys
-import os
-
-
-class PythonpathHelper:
- def get_python_path(self):
- for path_entry in sys.path:
- if os.path.exists(os.path.join(path_entry, 'robot')):
- return path_entry
@@ -1,8 +1,6 @@
*** Settings ***
Variables variables.py
Library OperatingSystem
-Library PythonpathHelper.py
-Resource webstart.txt
*** Variables ***
${TEST APP DIR} ${CURDIR}${/}..${/}..${/}target${/}test-classes
@@ -54,8 +52,7 @@ startApplicationAndImportLibraries
startExternalApplicationAndImportLibraries
[Arguments] ${name} ${arguments} ${jvmArguments}=
setLibrarySearchOrder ${name}Launcher
- ${pythonPath}= getPythonPath
- startProcess jython -Dpython.path=${pythonPath} ${jvmArguments} "${appLauncherScript}" ${APPLICATION} ${arguments}
+ startProcess jython ${jvmArguments} "${appLauncherScript}" ${APPLICATION} ${arguments}
applicationStarted
importRemoteLibraries ${name}
@@ -67,7 +64,6 @@ importRemoteLibraries
startWithJavaAgent
[Arguments] ${command} ${java agent args}=
- Variable Should Exist \${JAVA_AGENT_JAR} You should create jar with dependencies with command "mvn assembly:assembly" before running javaagent tests.
setEnvironmentVariable JAVA_TOOL_OPTIONS -javaagent:${JAVA_AGENT_JAR}=${java agent args}
check policy on unix
startProcess ${command}
@@ -1,16 +1,12 @@
*** Settings ***
Library RemoteApplications
-Resource ../resources/common.txt
+Resource common.txt
*** Keywords ***
Start Simple Application
[Arguments] ${name} ${port}=
RemoteApplications.Start Application ${name} java -Dproperty.name=${name} ${APPLICATION} ${name} 15 secs ${JAR DIR} ${port}
-Start Web Start Application
- [Arguments] ${name} ${jnlp}=${jnlpWithMainClassUrl}
- RemoteApplications.Start Application ${name} javaws ${jnlp} 60 secs ${JAR DIR}
-
Application Should Be Running
[Arguments] ${name}
Take Library Into Use ${JVM CONNECTOR LIB}
@@ -13,4 +13,4 @@
_paths.sort()
JAVA_AGENT_JAR = _paths[-1]
else:
- raise RuntimeError('Please run "mvn assembly:assembly first')
+ raise RuntimeError('remoteapplications jar not found')
@@ -1,12 +1,10 @@
*** Settings ***
+Resource remoteapps_resource.txt
Library FileServer.py WITH NAME FileServer
*** Variables ***
${codeBase} http://localhost:14563/test-app
${jnlpWithMainClassUrl} ${codeBase}/test-application.jnlp
-${jnlpWithoutMainClassUrl} ${codeBase}/test-application-withoutmainclass.jnlp
-${jnlpWithMainAttribute} ${codeBase}/test-application-with-main-attribute.jnlp
-${jnlpWithSsl} https://localhost:14564/test-app/test-application.jnlp
*** Keywords ***
startWebstartService
@@ -19,3 +17,6 @@ setTrustStore
JavaTools.setSystemProperty javax.net.ssl.trustStore ${TEST APP DIR}${/}jssecacerts
JavaTools.setSystemProperty javax.net.ssl.trustStorePassword changeit
+Start Web Start Application
+ [Arguments] ${name} ${jnlp}=${jnlpWithMainClassUrl}
+ RemoteApplications.Start Application ${name} javaws ${jnlp} 60 secs ${JAR DIR}

0 comments on commit cfec967

Please sign in to comment.