From 83a8ad38794a8601f242168d191258754c560010 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Thu, 19 Jan 2012 14:34:04 +0100
Subject: [PATCH] separate library .ecf and tests .ecf merged tests .ecf for
 draft 05 and current implementation

---
 ...{tests-draft_05-safe.ecf => tests-safe.ecf} | 18 ++++++++++++++----
 .../uri_template/uri_template-safe.ecf         | 13 -------------
 library/protocol/uri_template/uri_template.ecf | 15 ---------------
 3 files changed, 14 insertions(+), 32 deletions(-)
 rename library/protocol/uri_template/tests/{tests-draft_05-safe.ecf => tests-safe.ecf} (57%)

diff --git a/library/protocol/uri_template/tests/tests-draft_05-safe.ecf b/library/protocol/uri_template/tests/tests-safe.ecf
similarity index 57%
rename from library/protocol/uri_template/tests/tests-draft_05-safe.ecf
rename to library/protocol/uri_template/tests/tests-safe.ecf
index 0933b4af..7293d653 100644
--- a/library/protocol/uri_template/tests/tests-draft_05-safe.ecf
+++ b/library/protocol/uri_template/tests/tests-safe.ecf
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="test_uri_template_draft_05" uuid="1B44EA8C-7D88-4823-B16A-C9FA8DA3ACFF" library_target="test_uri_template_draft_05">
-	<target name="test_uri_template_draft_05">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="test_uri_template_draft_05" uuid="6309455F-E0C7-4DCB-BF34-9C750EE4AC79" library_target="tests">
+	<target name="tests">
 		<root class="ANY" feature="default_create"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
+			<assertions precondition="true"/>
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
+		<library name="uri_template" location="../uri_template-safe.ecf"/>
+		<tests name="tests" location="." recursive="false"/>
+	</target>
+	<target name="tests_draft_05">
+		<root class="ANY" feature="default_create"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
 			<exclude>/EIFGENs$</exclude>
@@ -18,8 +28,8 @@
 		<variable name="uri_template" value="draft_05"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
-		<library name="uri_template" location="uri_template-safe.ecf"/>
-		<tests name="tests" location=".\tests\" recursive="true">
+		<library name="uri_template" location="../uri_template-safe.ecf"/>
+		<tests name="tests" location="." recursive="true">
 			<file_rule>
 				<exclude>/test_uri_template.e$</exclude>
 			</file_rule>
diff --git a/library/protocol/uri_template/uri_template-safe.ecf b/library/protocol/uri_template/uri_template-safe.ecf
index 41c85f7b..e0231a25 100644
--- a/library/protocol/uri_template/uri_template-safe.ecf
+++ b/library/protocol/uri_template/uri_template-safe.ecf
@@ -30,17 +30,4 @@
 			</condition>
 		</cluster>
 	</target>
-	<target name="tests" extends="uri_template">
-		<root class="ANY" feature="default_create"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
-			<assertions precondition="true"/>
-		</option>
-		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
-		<tests name="tests" location=".\tests\"/>
-	</target>
 </system>
diff --git a/library/protocol/uri_template/uri_template.ecf b/library/protocol/uri_template/uri_template.ecf
index 5a6c0f76..f534cd8e 100644
--- a/library/protocol/uri_template/uri_template.ecf
+++ b/library/protocol/uri_template/uri_template.ecf
@@ -33,19 +33,4 @@
 			</condition>
 		</cluster>
 	</target>
-	<target name="tests" extends="uri_template">
-		<root class="ANY" feature="default_create"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true">
-			<assertions precondition="true"/>
-		</option>
-		<setting name="console_application" value="false"/>
-		<variable name="uri_template" value="draft_05"/>
-		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
-		<tests name="tests" location=".\tests\"/>
-	</target>
 </system>