backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing compilations for test suites related to persistency.

Browse Source
This commit is contained in:
Jocelyn FIAT
2015-06-18 14:07:41 +02:00
parent f619727997
commit b4407378db
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/persistence/implementation/store/database/database_connection_null.e
View File

@@ -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

2
library/persistence/store_mysql/tests/application.e
View File

@@ -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"))

2
library/persistence/store_mysql/tests/tests.ecf
View File

@@ -11,7 +11,7 @@
<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
<library name="model" location="..\..\..\model\cms_model-safe.ecf"/>
<library name="module_node" location="..\..\..\..\modules\node\node-safe.ecf"/>
<library name="persitence_mysql" location="..\persistence_mysql-safe.ecf" readonly="false"/>
<library name="persitence_store_mysql" location="..\store_mysql-safe.ecf" readonly="false"/>
<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/>
<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
<cluster name="tests" location=".\" recursive="true">

2
library/persistence/store_mysql/tests/util/abstract_db_test.e
View File

@@ -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

4
library/persistence/store_odbc/tests/application.e
View File

@@ -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

2
library/persistence/store_odbc/tests/tests-safe.ecf
View File

@@ -11,7 +11,7 @@
<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
<library name="model" location="..\..\..\model\cms_model-safe.ecf"/>
<library name="module_node" location="..\..\..\..\modules\node\node-safe.ecf"/>
<library name="persitence_sqlite" location="..\persistence_sqlite-safe.ecf" readonly="false"/>
<library name="persitence_store_odbc" location="..\store_odbc-safe.ecf" readonly="false"/>
<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/>
<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
<cluster name="tests" location=".\" recursive="true">

6
library/persistence/store_odbc/tests/util/abstract_db_test.e
View File

@@ -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