Merge column tests in one test file

diff --git a/selenium/tests/TestSuite.html b/selenium/tests/TestSuite.html
index 45178f61c3b87b2d423a4e7778ee897e6ecac6f7..9a3cca227215f71c7aa507e51bf084f5c552201f 100644 (file)
--- a/selenium/tests/TestSuite.html
+++ b/selenium/tests/TestSuite.html
@@ -23,7 +23,7 @@
 <tr>
        <td><a href="create_fk.php">Create FK</a></td>
 </tr>
-<tr>
+<!--tr>
        <td><a href="add_column.php">Add column</a></td>
 </tr>
 <tr>
@@ -34,6 +34,9 @@
 </tr>
 <tr>
        <td><a href="drop_column.php">Drop column</a></td>
+</tr-->
+<tr>
+       <td><a href="column.php">Add/Alter/Drop a column</a></td>
 </tr>
 <tr>
        <td><a href="create_view.php">Create/Alter/Drop a view</a></td>

diff --git a/selenium/tests/config.inc.php b/selenium/tests/config.inc.php
index 523f09b2f375f465e78e98a9d0be83a945d55927..139fdcc04712ef0c1e7b2166c89126a482cef408 100644 (file)
--- a/selenium/tests/config.inc.php
+++ b/selenium/tests/config.inc.php
@@ -1,8 +1,8 @@
 <?php
 require('../../lang/recoded/english.php');
 
-$webUrl = 'http://guillaume/~guillaume/projects/ppa/ppa.sel';
-$serverName = 'pg8.1'; // one of your $conf['servers'][*]['desc'] in conf/config.inc/php
+$webUrl = 'http://127.0.0.1/~ioguixigx/ppa/ppa.test';
+$serverName = 'pg83'; // one of your $conf['servers'][*]['desc'] in conf/config.inc/php
 #deprecated $superuser = 'ppatests_super'; // according to your selenium/tests/data/config.sql
 #deprecated $superpass = 'super'; // according to your selenium/tests/data/config.sql
 $superuser = 'postgres'; //only use to create and drop the following admin role

diff --git a/selenium/tests/table.php b/selenium/tests/table.php
index 159c46cf9998a50453665ad19e6e3f1975661c4b..191484fc7aea7061696b8a1eb6c72f4985afdba0 100644 (file)
--- a/selenium/tests/table.php
+++ b/selenium/tests/table.php
@@ -259,6 +259,11 @@
        <td>link=test_to_drop</td>
        <td></td>
 </tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
 <!-- Alter name-->
 <tr>
        <td>clickAndWait</td>
@@ -286,6 +291,11 @@
        <td>test_to_drop_renamed</td>
 </tr>
 <!--alter comment-->
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
 <tr>
        <td>clickAndWait</td>
        <td>//ul[@class='navlink']/li/a[text()='<?php echo $lang['stralter'] ?>']</td>
@@ -312,6 +322,11 @@
        <td>altered comment</td>
 </tr>
 <!--alter schema-->
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
 <tr>
        <td>clickAndWait</td>
        <td>//ul[@class='navlink']/li/a[text()='<?php echo $lang['stralter'] ?>']</td>
@@ -338,6 +353,11 @@
        <td>test_schema</td>
 </tr>
 <!--alter owner-->
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
 <tr>
        <td>clickAndWait</td>
        <td>//ul[@class='navlink']/li/a[text()='<?php echo $lang['stralter'] ?>']</td>
@@ -379,6 +399,11 @@
        <td>link=test_to_drop_renamed</td>
        <td></td>
 </tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
 <tr>
        <td>clickAndWait</td>
        <td>//ul[@class='navlink']/li/a[text()='<?php echo $lang['stralter'] ?>']</td>