some selenium tests cleanup
authorioguix <ioguix>
Fri, 28 Dec 2007 16:56:09 +0000 (16:56 +0000)
committerioguix <ioguix>
Fri, 28 Dec 2007 16:56:09 +0000 (16:56 +0000)
selenium/tests/TestSuite.html
selenium/tests/add_column.php [deleted file]
selenium/tests/alter_column.php [deleted file]
selenium/tests/alter_column_bad.php [deleted file]
selenium/tests/column.php [new file with mode: 0644]
selenium/tests/config.inc.php
selenium/tests/drop_column.php [deleted file]
selenium/tests/drop_index.php [deleted file]
selenium/tests/drop_schema_bad.php [deleted file]
selenium/tests/index.php [moved from selenium/tests/create_index.php with 74% similarity]

index 9a3cca227215f71c7aa507e51bf084f5c552201f..b1d4495f199a240c524258113002600f5654cc16 100644 (file)
 <tr>
        <td><a href="create_fk.php">Create FK</a></td>
 </tr>
-<!--tr>
-       <td><a href="add_column.php">Add column</a></td>
-</tr>
-<tr>
-       <td><a href="alter_column.php">Alter column</a></td>
-</tr>
-<tr>
-       <td><a href="alter_column_bad.php">Alter column fail</a></td>
-</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>
        <td><a href="create_view.php">Create/Alter/Drop a view</a></td>
 </tr>
 <tr>
-       <td><a href="create_index.php">Create index</a></td>
-</tr>
-<tr>
-       <td><a href="drop_index.php">Drop index</a></td>
+       <td><a href="index.php">Create/Drop index</a></td>
 </tr>
 <tr>
        <td><a href="drop_schema.php">Drop schema</a></td>
 </tr>
-<!--tr>
-       <td><a href="drop_schema_bad.php">Drop schema fail</a></td>
-</tr-->
-<!--tr>
-       <td><a href="drop_table.php">Drop table</a></td>
-</tr-->
 <tr>
        <td><a href="drop_role_bad.php">Drop admin role fail</a></td>
 </tr>
diff --git a/selenium/tests/add_column.php b/selenium/tests/add_column.php
deleted file mode 100644 (file)
index e505a56..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php require('./config.inc.php') ?>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<?php include('login.php') ?>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdatabases'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $testdb ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strschemas'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=public</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strtables'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=student</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strcolumns'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=Add column</td>
-       <td></td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>field</td>
-       <td>new_col</td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>type</td>
-       <td>label=integer</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>default</td>
-       <td>0</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>comment</td>
-       <td>test col to drop</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>//input[@value='Add']</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>//p[@class='message']</td>
-       <td><?php echo $lang['strcolumnadded'] ?></td>
-</tr>
-<?php include('logout.php'); ?>
-</tbody></table>
-</body>
-</html>
diff --git a/selenium/tests/alter_column.php b/selenium/tests/alter_column.php
deleted file mode 100644 (file)
index 3d5215e..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php require('./config.inc.php') ?>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<?php include('login.php') ?>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdatabases'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $testdb ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strschemas'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=public</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strtables'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=student</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strcolumns'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=new_col</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['stralter'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>field</td>
-       <td>altered_col</td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>type</td>
-       <td>label=character</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>lengths</td>
-       <td>1</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>notnull</td>
-       <td></td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>default</td>
-       <td>'-'</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>comment</td>
-       <td>altered col to drop</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>//input[@value='Alter']</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>//p[@class='message']</td>
-       <td><?php echo $lang['strcolumnaltered'] ?></td>
-</tr>
-<?php include('logout.php'); ?>
-</tbody></table>
-</body>
-</html>
diff --git a/selenium/tests/alter_column_bad.php b/selenium/tests/alter_column_bad.php
deleted file mode 100644 (file)
index f084965..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php require('./config.inc.php') ?>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<?php include('login.php') ?>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdatabases'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $testdb ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strschemas'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=public</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strtables'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=student</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strcolumns'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=name</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['stralter'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>type</td>
-       <td>label=integer</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>lengths</td>
-       <td>1</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>//input[@value='Alter']</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>//p[@class='message']</td>
-       <td><?php echo $lang['strcolumnalteredbad'] ?></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>cancel</td>
-       <td></td>
-</tr>
-<?php include('logout.php'); ?>
-</tbody></table>
-</body>
-</html>
diff --git a/selenium/tests/column.php b/selenium/tests/column.php
new file mode 100644 (file)
index 0000000..b2c5127
--- /dev/null
@@ -0,0 +1,215 @@
+<?php require('./config.inc.php') ?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Add/Alter/Drop a column</td></tr>
+</thead><tbody>
+<?php include('login.php') ?>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strdatabases'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $testdb ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strschemas'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=public</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strtables'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=student</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
+<!-- Add column -->
+<tr>
+       <td>clickAndWait</td>
+       <td>link=Add column</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>field</td>
+       <td>new_col</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>type</td>
+       <td>label=integer</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>default</td>
+       <td>0</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>comment</td>
+       <td>test col to drop</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//input[@value='Add']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>//p[@class='message']</td>
+       <td><?php echo $lang['strcolumnadded'] ?></td>
+</tr>
+<!-- Alter Column -->
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strcolumns'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=new_col</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['stralter'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>field</td>
+       <td>altered_col</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>type</td>
+       <td>label=character</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>lengths</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>notnull</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>default</td>
+       <td>'-'</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>comment</td>
+       <td>altered col to drop</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//input[@value='Alter']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>//p[@class='message']</td>
+       <td><?php echo $lang['strcolumnaltered'] ?></td>
+</tr>
+<!-- Alter column bad -->
+<tr>
+       <td>clickAndWait</td>
+       <td>//div[@class='trail']/descendant::a[@title='<?php echo $lang['strtable'] ?>']/span[@class='label' and text()='student']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=name</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['stralter'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>type</td>
+       <td>label=integer</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>lengths</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//input[@value='Alter']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>//p[@class='message']</td>
+       <td><?php echo $lang['strcolumnalteredbad'] ?></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>cancel</td>
+       <td></td>
+</tr>
+<!-- Drop column -->
+<tr>
+       <td>clickAndWait</td>
+       <td>//div[@class='trail']/descendant::a[@title='<?php echo $lang['strtable'] ?>']/span[@class='label' and text()='student']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=altered_col</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strdrop'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>cascade</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>drop</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>//p[@class='message']</td>
+       <td><?php echo $lang['strcolumndropped'] ?></td>
+</tr>
+<?php include('logout.php'); ?>
+</tbody></table>
+</body>
+</html>
index 139fdcc04712ef0c1e7b2166c89126a482cef408..38fe0d2547e1539a29c7f262a29d3b1586a996c8 100644 (file)
@@ -1,8 +1,8 @@
 <?php
 require('../../lang/recoded/english.php');
 
-$webUrl = 'http://127.0.0.1/~ioguixigx/ppa/ppa.test';
-$serverName = 'pg83'; // one of your $conf['servers'][*]['desc'] in conf/config.inc/php
+$webUrl = 'http://boox/~ioguix/ppa/ppa.test';
+$serverName = '8.3'; // 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/drop_column.php b/selenium/tests/drop_column.php
deleted file mode 100644 (file)
index 35a50e2..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php require('./config.inc.php') ?>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<?php include('login.php') ?>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdatabases'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $testdb ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strschemas'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=public</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strtables'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=student</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strcolumns'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=altered_col</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdrop'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>cascade</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>drop</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>//p[@class='message']</td>
-       <td><?php echo $lang['strcolumndropped'] ?></td>
-</tr>
-<?php include('logout.php'); ?>
-</tbody></table>
-</body>
-</html>
diff --git a/selenium/tests/drop_index.php b/selenium/tests/drop_index.php
deleted file mode 100644 (file)
index 6599dfb..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php require('./config.inc.php') ?>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<?php include('login.php') ?>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdatabases'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $testdb ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strschemas'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=public</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strtables'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=student</td>
-       <td></td>
-</tr>
-
-
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strindexes'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>//tr/td[text()='name_unique']/../td/a[text()='Drop']</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>cascade</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>drop</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>//p[@class='message']</td>
-       <td><?php echo $lang['strindexdropped'] ?></td>
-</tr>
-<?php include('logout.php'); ?>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/selenium/tests/drop_schema_bad.php b/selenium/tests/drop_schema_bad.php
deleted file mode 100644 (file)
index 2ae1ee4..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php require('./config.inc.php') ?>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Droping a schema with tables should failed without checking cascade</td></tr>
-</thead><tbody>
-<?php include('login.php') ?>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strdatabases'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $testdb ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=<?php echo $lang['strschemas'] ?></td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>//tr/td/a[text()='public']/../../td/a[text()='<?php echo $lang['strdrop'] ?>']</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>drop</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>//p[@class='message']</td>
-       <td><?php echo $lang['strschemadroppedbad'] ?></td>
-</tr>
-<?php include('logout.php'); ?>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
similarity index 74%
rename from selenium/tests/create_index.php
rename to selenium/tests/index.php
index cbf3a99d894feef3f0a99b8b825edd8799077249..4a1d678a285f163d824b01773c2214c0267f60d2 100644 (file)
@@ -7,7 +7,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
+<tr><td rowspan="1" colspan="3">Create/Drop an unique index</td></tr>
 </thead><tbody>
 <?php include('login.php') ?>
 <tr>
        <td>//p[@class='message']</td>
        <td><?php echo $lang['strindexcreated'] ?></td>
 </tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=<?php echo $lang['strindexes'] ?></td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//tr/td[text()='name_unique']/../td/a[text()='Drop']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>cascade</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>drop</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>//p[@class='message']</td>
+       <td><?php echo $lang['strindexdropped'] ?></td>
+</tr>
 <?php include('logout.php'); ?>
 </tbody></table>
 </body>