From b4407378db3fe10c97309393a93b603736f92b9c Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 18 Jun 2015 14:07:41 +0200 Subject: [PATCH] Fixing compilations for test suites related to persistency. --- .../store/database/database_connection_null.e | 14 +++++++------- .../persistence/store_mysql/tests/application.e | 2 +- library/persistence/store_mysql/tests/tests.ecf | 2 +- .../store_mysql/tests/util/abstract_db_test.e | 2 +- library/persistence/store_odbc/tests/application.e | 4 ++-- .../persistence/store_odbc/tests/tests-safe.ecf | 2 +- .../store_odbc/tests/util/abstract_db_test.e | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/library/persistence/implementation/store/database/database_connection_null.e b/library/persistence/implementation/store/database/database_connection_null.e index ec54d13..2cc85d6 100644 --- a/library/persistence/implementation/store/database/database_connection_null.e +++ b/library/persistence/implementation/store/database/database_connection_null.e @@ -15,11 +15,11 @@ inherit end create - make, make_common, make_basic + login, login_with_default, login_with_database_name feature -- Initialization - make_common + login_with_default -- Create a database handler for ODBC with common settings. do create database_error_handler.make @@ -30,18 +30,18 @@ feature -- Initialization create db_control.make end - make (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN) + login (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN) -- Create a database handler for ODBC. do - make_common + login_with_default end - make_basic (a_database_name: STRING) + login_with_database_name (a_database_name: STRING) -- Create a database handler for ODBC. do - make_common + login_with_default end @@ -49,7 +49,7 @@ feature -- Initialization -- Login with `a_connection_string' -- and immediately connect to database. do - make_common + login_with_default end diff --git a/library/persistence/store_mysql/tests/application.e b/library/persistence/store_mysql/tests/application.e index df6b90d..63f6c03 100644 --- a/library/persistence/store_mysql/tests/application.e +++ b/library/persistence/store_mysql/tests/application.e @@ -24,7 +24,7 @@ feature {NONE} -- Initialization (create {CLEAN_DB}).clean_db(connection) - create {CMS_STORAGE_MYSQL} storage.make (connection) + create {CMS_STORAGE_STORE_MYSQL} storage.make (connection) l_node := custom_node ("Content", "Summary", "Title") storage.new_user (default_user) storage.new_user (custom_user ("u2", "p2", "e2")) diff --git a/library/persistence/store_mysql/tests/tests.ecf b/library/persistence/store_mysql/tests/tests.ecf index b88fcef..7ce81ca 100644 --- a/library/persistence/store_mysql/tests/tests.ecf +++ b/library/persistence/store_mysql/tests/tests.ecf @@ -11,7 +11,7 @@ - + diff --git a/library/persistence/store_mysql/tests/util/abstract_db_test.e b/library/persistence/store_mysql/tests/util/abstract_db_test.e index e09c9da..7a1085c 100644 --- a/library/persistence/store_mysql/tests/util/abstract_db_test.e +++ b/library/persistence/store_mysql/tests/util/abstract_db_test.e @@ -15,7 +15,7 @@ feature -- Database connection create Result.login_with_schema ("cms_dev", "root", "") end - storage: CMS_STORAGE_MYSQL + storage: CMS_STORAGE_STORE_MYSQL once create Result.make (connection) end diff --git a/library/persistence/store_odbc/tests/application.e b/library/persistence/store_odbc/tests/application.e index 9b3ede1..2b87dd6 100644 --- a/library/persistence/store_odbc/tests/application.e +++ b/library/persistence/store_odbc/tests/application.e @@ -17,11 +17,11 @@ feature {NONE} -- Initialization make -- Run application. local - storage: CMS_STORAGE_SQLITE + storage: CMS_STORAGE_STORE_ODBC do -- Change the path. create connection.login_with_connection_string ("Driver=SQLite3 ODBC Driver;Database=./cms_lite.db;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;") - create storage.make (connection) + create storage.make_with_driver (connection, "sqlite3") end connection: DATABASE_CONNECTION_ODBC diff --git a/library/persistence/store_odbc/tests/tests-safe.ecf b/library/persistence/store_odbc/tests/tests-safe.ecf index a8f1365..cce9518 100644 --- a/library/persistence/store_odbc/tests/tests-safe.ecf +++ b/library/persistence/store_odbc/tests/tests-safe.ecf @@ -11,7 +11,7 @@ - + diff --git a/library/persistence/store_odbc/tests/util/abstract_db_test.e b/library/persistence/store_odbc/tests/util/abstract_db_test.e index 3ce95e3..d6177d3 100644 --- a/library/persistence/store_odbc/tests/util/abstract_db_test.e +++ b/library/persistence/store_odbc/tests/util/abstract_db_test.e @@ -12,8 +12,8 @@ feature -- Database connection connection: DATABASE_CONNECTION_ODBC -- odbc database connection once - create Result.login_with_connection_string ("Driver=SQLite3 ODBC Driver;Database=cms_lite.db;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;") --- create Result.make_basic ("cms_lite.db") + create Result.login_with_connection_string ("Driver=SQLite3 ODBC Driver;Database=test_roc.db;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;") +-- create Result.make_basic ("test_roc.db") end feature {NONE} -- Implementation @@ -21,7 +21,7 @@ feature {NONE} -- Implementation storage: CMS_STORAGE -- node provider. once - create {CMS_STORAGE_SQLITE} Result.make (connection) + create {CMS_STORAGE_STORE_ODBC} Result.make_with_driver (connection, "sqlite3") end feature {NONE} -- Fixture Factory: Users