Permalink
Browse files

Merge pull request #13 from avanderberg/master

Added readme file, updated link and some spelling corrections
  • Loading branch information...
2 parents 92542d1 + a412dc2 commit 1ba965aa4e5b78b3129a193d6fe82f5a4c665b15 @ThomasJaspers committed Sep 7, 2012
View
@@ -0,0 +1 @@
+The Robot Framework Database Library is a library which provides common functionality for testing database contents. Please see the wiki on github for more information and the provided keywords.
@@ -45,17 +45,17 @@
width: 10em;
}
</style>
-<title>DBLibraryDemo MySql</title>
+<title>DBLibraryDemo MySQL</title>
</head>
<body>
-<h1>DBLibraryDemo MySql</h1>
+<h1>DBLibraryDemo MySQL</h1>
<table border="1" id="setting">
<tr>
<th class="name" colspan="5">Setting</th>
</tr>
<tr>
<td class="name">Documentation</td>
-<td class="colspan4" colspan="4">This is a sample Robot Library testsuite demonstrating the usage of the Database Library (<a href="http://code.google.com/p/robotframework-dblibrary/">http://code.google.com/p/robotframework-dblibrary/</a>). Please make sure you have setup a proper MySql Database and user according to the instrcutions given in the README.txt bundled with this demo.</td>
+<td class="colspan4" colspan="4">This is a sample Robot Library testsuite demonstrating the usage of the Database Library (<a href="http://thomasjaspers.github.com/robotframework-dblibrary/">http://thomasjaspers.github.com/robotframework-dblibrary/</a>). Please make sure you have setup a working MySQL database and user according to the instrcutions given in the README.txt bundled with this demo.</td>
</tr>
<tr>
<td class="name">Suite Setup</td>
@@ -147,7 +147,7 @@
<tr>
<td class="name"><a name="test_Basic Checks">Basic Checks</a></td>
<td>[Documentation]</td>
-<td class="colspan3" colspan="3">Performs some basic checks on the created DemoTable. You can check the generated Robot Log-File to see the transactions isolation level fetched.</td>
+<td class="colspan3" colspan="3">Performs some basic checks on the created DemoTable. You can check the generated Robot Framework log file to see the transactions isolation level fetched.</td>
</tr>
<tr>
<td class="name"></td>
@@ -220,7 +220,7 @@
<tr>
<td class="name"><a name="test_Check Number of Rows">Check Number of Rows</a></td>
<td>[Documentation]</td>
-<td class="colspan3" colspan="3">Perform some checks related to the number of Rows in the DemoTable.</td>
+<td class="colspan3" colspan="3">Perform some checks related to the number of rows in the DemoTable.</td>
</tr>
<tr>
<td class="name"></td>
@@ -260,7 +260,7 @@
<tr>
<td class="name"><a name="test_Store and read results to/from file">Store and read results to/from file</a></td>
<td>[Documentation]</td>
-<td class="colspan3" colspan="3">This testcase checks the functionality of the keywords "Store Query Result To File " and "Compare Query Result To File".</td>
+<td class="colspan3" colspan="3">This testcase checks the functionality of the keywords "Store Query Result To File" and "Compare Query Result To File".</td>
</tr>
<tr>
<td class="name"></td>
@@ -286,7 +286,7 @@
<tr>
<td class="name"><a name="test_Content Check">Content Check</a></td>
<td>[Documentation]</td>
-<td class="colspan3" colspan="3">Checks for specific content in the DemoTable.You can inspect the Logfile to see the value fetched by the "Read Single Value From Table" keyword.</td>
+<td class="colspan3" colspan="3">Checks for specific content in the DemoTable. You can inspect the log file to see the value fetched by the "Read Single Value From Table" keyword.</td>
</tr>
<tr>
<td class="name"></td>
@@ -40,18 +40,18 @@
width: 10em;
}
</style>
-<title>Dblibrarydemo Mysql</title>
+<title>Dblibrarydemo MySQL</title>
</head>
<body>
-<h1>Dblibrarydemo Mysql</h1>
+<h1>Dblibrarydemo MySQL</h1>
<table id="settings" border="1">
<tr>
<th class="name">Setting</th>
<th colspan="4">Value</th>
</tr>
<tr>
<td class="name">Documentation</td>
-<td colspan="4">This is a sample Robot Library testsuite demonstrating the usage of the Database Library (<a href="http://code.google.com/p/robotframework-dblibrary/">http://code.google.com/p/robotframework-dblibrary/</a>). Please make sure you have setup a proper MySql Database and user according to the instrcutions given in the README.txt bundled with this demo.</td>
+<td colspan="4">This is a sample Robot Library testsuite demonstrating the usage of the Database Library (<a href="http://thomasjaspers.github.com/robotframework-dblibrary/">http://thomasjaspers.github.com/robotframework-dblibrary/</a>). Please make sure you have setup a working MySQL database and user according to the instrcutions given in the README.txt bundled with this demo.</td>
</tr>
<tr>
<td class="name">Suite Setup</td>
@@ -146,7 +146,7 @@
<tr>
<td class="name"><a name="test_Basic Checks">Basic Checks</a></td>
<td>[Documentation]</td>
-<td colspan="3">Performs some basic checks on the created DemoTable. You can check the generated Robot Log-File to see the transactions isolation level fetched.</td>
+<td colspan="3">Performs some basic checks on the created DemoTable. You can check the generated Robot Framework log file to see the transactions isolation level fetched.</td>
</tr>
<tr>
<td class="name"></td>
@@ -219,7 +219,7 @@
<tr>
<td class="name"><a name="test_Check Number of Rows">Check Number of Rows</a></td>
<td>[Documentation]</td>
-<td colspan="3">Perform some checks related to the number of Rows in the DemoTable.</td>
+<td colspan="3">Perform some checks related to the number of rows in the DemoTable.</td>
</tr>
<tr>
<td class="name"></td>
@@ -259,7 +259,7 @@
<tr>
<td class="name"><a name="test_Store and read results to/from file">Store and read results to/from file</a></td>
<td>[Documentation]</td>
-<td class="colspan3" colspan="3">This testcase checks the functionality of the keywords "Store Query Result To File " and "Compare Query Result To File".</td>
+<td class="colspan3" colspan="3">This testcase checks the functionality of the keywords "Store Query Result To File" and "Compare Query Result To File".</td>
</tr>
<tr>
<td class="name"></td>
@@ -278,7 +278,7 @@
<tr>
<td class="name"><a name="test_Content Check">Content Check</a></td>
<td>[Documentation]</td>
-<td colspan="3">Checks for specific content in the DemoTable.You can inspect the Logfile to see the value fetched by the "Read Single Value From Table" keyword.</td>
+<td colspan="3">Checks for specific content in the DemoTable. You can inspect the Logfile to see the value fetched by the "Read Single Value From Table" keyword.</td>
</tr>
<tr>
<td class="name"></td>
View
@@ -1,41 +1,41 @@
This sample demonstrates the usage of the Robot Framework Database Library.
-The example as such is platform independent, but the provided start scripts of cause do
+The example itself is platform independent, but the provided start scripts
depend on the corresponding platform.
Currently the following start scripts are provided:
-Windows : startDBLibraryDemo_MySql.bat
+Windows: startDBLibraryDemo_MySql.bat
startDBLibraryDemo_Remote_MySql.bat
startDBLibraryServer.bat
Mac OS X: startDBLibraryDemo_MySql.sh
-Of course the start-script for Mac OS X can be easily adapted for other Unix
+Of course the start script for Mac OS X can be easily adapted for other Unix
operating systems. You will need to download the required driver JAR(s) for
-your database and adept the CLASSPATH in the start scripts accordingly.
+your database and adapt the CLASSPATH in the start scripts accordingly.
-As the port where you are running the MySql database might differ from the default
+As the port where you are running the MySQL database might differ from the default
port this value is set as a variable in the start script. Please change it if needed.
-For the MySql database you can use the following commands to setup the database
-and user required for the example (your path to mysql might of course differ from
-the example below):
+For the MySQL database you can use the following commands to setup the database
+and user required for the example (your path to MySQL might differ from the
+example below):
C:\xampp\mysql\bin>mysql -u root -p
mysql> create database databaselibrarydemo;
mysql> create user 'dblib'@'localhost' identified by 'dblib';
mysql> grant all privileges on databaselibrarydemo.* to 'dblib';
-For Mac OS X the easiest way to setup a MySql database is for sure using MAMP:
+For Mac OS X the easiest way to setup a MySQL database is using MAMP:
http://www.mamp.info/de/index.html
-
NOTE:
In case you are using a different database you need to change the database connection
-string given as one parameter to the "Connect to Database" keyword during Suite Setup. In
-addition you need to edit the CLASSPATH in the start script to include the proper Driver-JAR.
+string given as parameter to the "Connect to Database" keyword in the Suite Setup. In
+addition you need to edit the CLASSPATH in the start script to include the correct
+Driver-JAR.
-For MY-SQL information is provided here from where to download the Driver-JAR:
+More information about MySQL is provided where the Driver-JAR can be downloaded:
https://github.com/ThomasJaspers/robotframework-dblibrary/wiki
More information can also be found here:
-https://github.com/ThomasJaspers/robotframework-dblibrary/wiki/Database-Library-Sample
+https://github.com/ThomasJaspers/robotframework-dblibrary/wiki/Database-Library-Sample
@@ -1,7 +1,7 @@
@echo off
REM
-REM Please download and copy the latest MySql JDBC Driver-JAR from here:
+REM Please download and copy the latest MySQL JDBC Driver-JAR from here:
REM http://dev.mysql.com/downloads/connector/j/
REM
REM Copy the JAR-File to the Sample-Directory and modify the Classpath set below
@@ -10,7 +10,3 @@ REM
set CLASSPATH=%CLASSPATH%;./dblibrary-2.0.jar;./mysql-connector-java-5.1.6.jar
jybot --variable PORT:3306 --outputdir c:\ --output DBLibraryDemo_MySql_Output.xml --log DBLibraryDemo_MySql_Log.html --report DBLibraryDemo_MySql_Report.html DBLibraryDemo_MySql.html
-
-
-
-
@@ -1,6 +1,6 @@
#!/bin/bash
-# Please download and copy the latest MySql JDBC Driver-JAR from here:
+# Please download and copy the latest MySQL JDBC Driver-JAR from here:
# http://dev.mysql.com/downloads/connector/j/
#
# Copy the JAR-File to the Sample-Directory and modify the Classpath set below
@@ -10,4 +10,3 @@ CLASSPATH=$CLASSPATH:./dblibrary-1.0.jar:./mysql-connector-java-5.1.12-bin.jar
export CLASSPATH
jybot --variable PORT:8889 --outputdir /tmp --output DBLibraryDemo_MySql_Output.xml --log DBLibraryDemo_MySql_Log.html --report DBLibraryDemo_MySql_Report.html DBLibraryDemo_MySql.html
-
@@ -1,9 +1,3 @@
@echo off
-
-
pybot --variable PORT:3306 --outputdir c:\ --output DBLibraryDemo_Remote_MySql_Output.xml --log DBLibraryDemo_Remote_MySql_Log.html --report DBLibraryDemo_Remote_MySql_Report.html DBLibraryDemo_Remote_MySql.html
-
-
-
-
@@ -1,6 +1,5 @@
@echo off
-
set CLASSPATH=%CLASSPATH%;./dblibrary-2.0-server.jar;./mysql-connector-java-5.1.6.jar
java org.robot.database.server.RemoteServer --port 8271

0 comments on commit 1ba965a

Please sign in to comment.