From 375b53c677308a0dc8d84f334bb1c9392024790e Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Tue, 17 Oct 2017 13:39:59 +0200
Subject: [PATCH] Improved a few ecf file for tests. Cosmetic.

---
 library/configuration/tests/config_tests.ecf  |  3 +--
 library/gcse/test/test.ecf                    |  7 +++--
 .../persistence/store_mysql/tests/tests.ecf   | 10 +++----
 .../persistence/store_odbc/tests/tests.ecf    |  4 +--
 library/recaptcha/test/test.ecf               |  9 +++----
 src/service/cms_api.e                         | 26 ++++++++++---------
 6 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/library/configuration/tests/config_tests.ecf b/library/configuration/tests/config_tests.ecf
index 7ff165b..a1d2a27 100644
--- a/library/configuration/tests/config_tests.ecf
+++ b/library/configuration/tests/config_tests.ecf
@@ -8,8 +8,7 @@
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
 		<capability>
-			<concurrency support="none" use="none"/>
-			<void_safety support="transitional" use="transitional"/>
+			<concurrency use="none"/>
 		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="config" location="..\config.ecf" readonly="false"/>
diff --git a/library/gcse/test/test.ecf b/library/gcse/test/test.ecf
index b84719d..66975ea 100644
--- a/library/gcse/test/test.ecf
+++ b/library/gcse/test/test.ecf
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="test" uuid="8E9CF931-93CE-4C5A-BF1A-6FD7D850C5FB">
-	<target name="test">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="gcse_tests" uuid="8E9CF931-93CE-4C5A-BF1A-6FD7D850C5FB">
+	<target name="gcse_tests">
 		<root class="APPLICATION" feature="make"/>
 		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
 		<capability>
-			<concurrency support="none"/>
-			<void_safety support="transitional" use="transitional"/>
+			<concurrency use="none"/>
 		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="gcse" location="..\gcse.ecf" readonly="false"/>
diff --git a/library/persistence/store_mysql/tests/tests.ecf b/library/persistence/store_mysql/tests/tests.ecf
index 5dee278..7c66547 100644
--- a/library/persistence/store_mysql/tests/tests.ecf
+++ b/library/persistence/store_mysql/tests/tests.ecf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="tests" uuid="FCC2264E-784F-4ACF-9262-E348904FDBA5">
-	<target name="tests">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="store_mysql_tests" uuid="FCC2264E-784F-4ACF-9262-E348904FDBA5">
+	<target name="store_mysql_tests">
 		<root class="APPLICATION" feature="make"/>
-		<option warning="true" >
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option warning="true">
+			<assertions supplier_precondition="true"/>
 		</option>
 		<capability>
 			<concurrency support="thread" use="thread"/>
-			<void_safety support="conformance" use="conformance"/>
+			<void_safety support="conformance"/>
 		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\..\..\cms.ecf" readonly="false"/>
diff --git a/library/persistence/store_odbc/tests/tests.ecf b/library/persistence/store_odbc/tests/tests.ecf
index 9ad3d5b..d5a7f67 100644
--- a/library/persistence/store_odbc/tests/tests.ecf
+++ b/library/persistence/store_odbc/tests/tests.ecf
@@ -3,11 +3,11 @@
 	<target name="tests_store_odbc">
 		<root class="APPLICATION" feature="make"/>
 		<option warning="true">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+			<assertions supplier_precondition="true"/>
 		</option>
 		<capability>
 			<concurrency support="thread" use="thread"/>
-			<void_safety support="conformance" use="conformance"/>
+			<void_safety support="conformance"/>
 		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\..\..\cms.ecf" readonly="false"/>
diff --git a/library/recaptcha/test/test.ecf b/library/recaptcha/test/test.ecf
index 15f4b4d..d9ba348 100644
--- a/library/recaptcha/test/test.ecf
+++ b/library/recaptcha/test/test.ecf
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="test" uuid="CE9FCE69-EE0A-4028-AA02-BD9F8ABA7586">
-	<target name="test">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="recaptcha_tests" uuid="CE9FCE69-EE0A-4028-AA02-BD9F8ABA7586">
+	<target name="recaptcha_tests">
 		<root class="APPLICATION" feature="make"/>
 		<option warning="true">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+			<assertions supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
 		<capability>
-			<concurrency support="none"/>
-			<void_safety support="transitional" use="transitional"/>
+			<concurrency use="none"/>
 		</capability>
 		<precompile name="base_pre" location="$ISE_PRECOMP\base-safe.ecf"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
diff --git a/src/service/cms_api.e b/src/service/cms_api.e
index b9f6f29..7a02ae4 100644
--- a/src/service/cms_api.e
+++ b/src/service/cms_api.e
@@ -315,7 +315,7 @@ feature -- Execution initialization
 			setup_formats
 		end
 
-feature {CMS_ACCESS} -- Module management		
+feature {CMS_ACCESS} -- Module management
 
 	install_all_modules
 			-- Install CMS or uninstalled module which are enabled.
@@ -387,9 +387,9 @@ feature -- Access
 			-- Logger
 
 	storage: CMS_STORAGE
-			-- Default persistence storage.	
+			-- Default persistence storage.
 
-feature -- Access: url			
+feature -- Access: url
 
 	base_url: detachable IMMUTABLE_STRING_8
 			-- Base url if any.
@@ -449,7 +449,7 @@ feature {NONE} -- Implementation/WebAPI.
 	webapi_base_path_location: IMMUTABLE_STRING_8
 			-- Webapi path without first slash!
 
-feature -- Access: Administration		
+feature -- Access: Administration
 
 	is_administration_request (req: WSF_REQUEST): BOOLEAN
 		do
@@ -530,7 +530,7 @@ feature -- CMS links
 			Result := link (real_user_display_name (u), "user/" + u.id.out, Void)
 		end
 
-feature -- Helpers: URLs	
+feature -- Helpers: URLs
 
 	location_absolute_url (a_location: READABLE_STRING_8; opts: detachable CMS_API_OPTIONS): STRING
 			-- Absolute URL for `a_location'.
@@ -637,7 +637,7 @@ feature {NONE} -- Access: request
 feature -- Content
 
 	content_types: ARRAYED_LIST [CMS_CONTENT_TYPE]
-			-- Available content types	
+			-- Available content types
 
 	add_content_type (a_type: CMS_CONTENT_TYPE)
 			-- Register content type `a_type'.
@@ -731,6 +731,8 @@ feature -- Status Report
 
 	string_representation_of_errors: STRING_32
 			-- String representation of all error(s).
+		require
+			has_error: has_error
 		do
 			Result := error_handler.as_string_representation
 		end
@@ -899,7 +901,7 @@ feature -- Emails
 		end
 
 	process_emails (lst: ITERABLE [CMS_EMAIL])
-			-- Process collection of email `lst'.	
+			-- Process collection of email `lst'.
 		do
 			across
 				lst as ic
@@ -1131,7 +1133,7 @@ feature -- Hooks
 			end
 		end
 
-feature -- Path aliases	
+feature -- Path aliases
 
 	is_valid_path_alias (a_alias: READABLE_STRING_GENERAL): BOOLEAN
 		do
@@ -1226,7 +1228,7 @@ feature {NONE}-- Implementation
 			-- Cached value for `user_api`.
 
 	internal_response_api: detachable like response_api
-			-- Cached value for `response_api`.			
+			-- Cached value for `response_api`.
 
 feature -- Environment/ theme
 
@@ -1288,7 +1290,7 @@ feature -- Environment/ theme
 			Result := theme_location.extended ("assets")
 		end
 
-feature -- Theming path helpers		
+feature -- Theming path helpers
 
 	theme_location_for (a_theme_name: READABLE_STRING_GENERAL): PATH
 		do
@@ -1538,7 +1540,7 @@ feature -- Site builtin variables
 			end
 		end
 
-feature -- Request utilities		
+feature -- Request utilities
 
 	execution_variable (a_name: READABLE_STRING_GENERAL): detachable ANY
 			-- Execution variable related to `a_name'
@@ -1563,7 +1565,7 @@ feature -- Request utilities
 		end
 
 
-feature {CMS_API_ACCESS, CMS_RESPONSE, CMS_MODULE} -- Request utilities	
+feature {CMS_API_ACCESS, CMS_RESPONSE, CMS_MODULE} -- Request utilities
 
 	current_user (req: WSF_REQUEST): detachable CMS_USER
 			-- Current user or Void in case of Guest user.