pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Randomise table names for tests.

pull/25/head
Yosry Muhammad 2019-07-17 16:50:59 +01:00 committed by Dave Page
parent d78dfbd30f
commit f5b927b925
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/pgadmin/tools/sqleditor/tests/test_is_query_resultset_updatable.py
View File

@ -8,6 +8,7 @@
##########################################################################
import json
import random
from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
@ -22,35 +23,35 @@ class TestQueryUpdatableResultset(BaseTestGenerator):
result-set is updatable. """
scenarios = [
('When selecting all columns of the table', dict(
sql='SELECT * FROM test_for_updatable_resultset;',
sql='SELECT * FROM %s;',
primary_keys={
'pk_col1': 'int4',
'pk_col2': 'int4'
}
)),
('When selecting all primary keys of the table', dict(
sql='SELECT pk_col1, pk_col2 FROM test_for_updatable_resultset;',
sql='SELECT pk_col1, pk_col2 FROM %s;',
primary_keys={
'pk_col1': 'int4',
'pk_col2': 'int4'
}
)),
('When selecting some of the primary keys of the table', dict(
sql='SELECT pk_col2 FROM test_for_updatable_resultset;',
sql='SELECT pk_col2 FROM %s;',
primary_keys=None
)),
('When selecting none of the primary keys of the table', dict(
sql='SELECT normal_col1 FROM test_for_updatable_resultset;',
sql='SELECT normal_col1 FROM %s;',
primary_keys=None
)),
('When renaming a primary key', dict(
sql='SELECT pk_col1 as some_col, '
'pk_col2 FROM test_for_updatable_resultset;',
'pk_col2 FROM "%s";',
primary_keys=None
)),
('When renaming a column to a primary key name', dict(
sql='SELECT pk_col1, pk_col2, normal_col1 as pk_col1 '
'FROM test_for_updatable_resultset;',
'FROM %s;',
primary_keys=None
))
]
@ -59,12 +60,15 @@ class TestQueryUpdatableResultset(BaseTestGenerator):
self._initialize_database_connection()
self._initialize_query_tool()
self._initialize_urls()
self._create_test_table()
def runTest(self):
# Create test table (unique for each scenario)
self._create_test_table()
# Add test table name to the query
sql = self.sql % self.test_table_name
is_success, response_data = \
execute_query(tester=self.tester,
query=self.sql,
query=sql,
poll_url=self.poll_url,
start_query_tool_url=self.start_query_tool_url)
self.assertEquals(is_success, True)
@ -105,17 +109,19 @@ class TestQueryUpdatableResultset(BaseTestGenerator):
self.poll_url = '/sqleditor/poll/{0}'.format(self.trans_id)
def _create_test_table(self):
self.test_table_name = "test_for_updatable_resultset" + \
str(random.randint(1000, 9999))
create_sql = """
DROP TABLE IF EXISTS test_for_updatable_resultset;
DROP TABLE IF EXISTS "%s";
CREATE TABLE test_for_updatable_resultset(
CREATE TABLE "%s"(
pk_col1 SERIAL,
pk_col2 SERIAL,
normal_col1 VARCHAR,
normal_col2 VARCHAR,
PRIMARY KEY(pk_col1, pk_col2)
);
"""
""" % (self.test_table_name, self.test_table_name)
is_success, _ = \
execute_query(tester=self.tester,

30
web/pgadmin/tools/sqleditor/tests/test_save_changed_data.py
View File

@ -8,6 +8,7 @@
##########################################################################
import json
import random
from pgadmin.browser.server_groups.servers.databases.tests import utils as \
database_utils
@ -66,7 +67,7 @@ class TestSaveChangedData(BaseTestGenerator):
]
},
save_status=True,
check_sql='SELECT * FROM test_for_save_data WHERE pk_col = 3',
check_sql='SELECT * FROM %s WHERE pk_col = 3',
check_result=[[3, "three"]]
)),
('When inserting new invalid row', dict(
@ -162,7 +163,7 @@ class TestSaveChangedData(BaseTestGenerator):
]
},
save_status=True,
check_sql='SELECT * FROM test_for_save_data WHERE pk_col = 1',
check_sql='SELECT * FROM %s WHERE pk_col = 1',
check_result=[[1, "ONE"]]
)),
('When updating a row in an invalid way', dict(
@ -249,7 +250,7 @@ class TestSaveChangedData(BaseTestGenerator):
]
},
save_status=True,
check_sql='SELECT * FROM test_for_save_data WHERE pk_col = 2',
check_sql='SELECT * FROM %s WHERE pk_col = 2',
check_result='SELECT 0'
)),
]
@ -258,9 +259,10 @@ class TestSaveChangedData(BaseTestGenerator):
self._initialize_database_connection()
self._initialize_query_tool()
self._initialize_urls_and_select_sql()
self._create_test_table()
def runTest(self):
# Create test table (unique for each scenario)
self._create_test_table()
# Execute select sql
is_success, _ = \
execute_query(tester=self.tester,
@ -283,9 +285,11 @@ class TestSaveChangedData(BaseTestGenerator):
if self.check_sql:
# Execute check sql
# Add test table name to the query
check_sql = self.check_sql % self.test_table_name
is_success, response_data = \
execute_query(tester=self.tester,
query=self.check_sql,
query=check_sql,
start_query_tool_url=self.start_query_tool_url,
poll_url=self.poll_url)
self.assertEquals(is_success, True)
@ -320,25 +324,29 @@ class TestSaveChangedData(BaseTestGenerator):
self.trans_id = response_data['data']['gridTransId']
def _initialize_urls_and_select_sql(self):
self.start_query_tool_url = \
'/sqleditor/query_tool/start/{0}'.format(self.trans_id)
self.save_url = '/sqleditor/save/{0}'.format(self.trans_id)
self.poll_url = '/sqleditor/poll/{0}'.format(self.trans_id)
self.select_sql = 'SELECT * FROM test_for_save_data;'
def _create_test_table(self):
self.test_table_name = "test_for_save_data" + \
str(random.randint(1000, 9999))
create_sql = """
DROP TABLE IF EXISTS test_for_save_data;
DROP TABLE IF EXISTS "%s";
CREATE TABLE test_for_save_data(
CREATE TABLE "%s"(
pk_col INT PRIMARY KEY,
normal_col VARCHAR);
INSERT INTO test_for_save_data VALUES
INSERT INTO "%s" VALUES
(1, 'one'),
(2, 'two');
"""
""" % (self.test_table_name,
self.test_table_name,
self.test_table_name)
self.select_sql = 'SELECT * FROM %s;' % self.test_table_name
is_success, _ = \
execute_query(tester=self.tester,
query=create_sql,