From d66d5047b44cfd0d3715ce03ffdc9da55435bd8a Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Wed, 12 Nov 2014 19:14:07 +0100
Subject: [PATCH] Move build_number resource to the right context

---
 test_client/custom_rules.xml                  | 14 ++++++++++
 test_client/res/values/setup.xml              |  1 +
 test_client/tests/custom_rules.xml            | 16 -----------
 test_client/tests/res/values/setup.xml        | 28 -------------------
 .../android/lib/test_project/test/Utils.java  |  1 +
 5 files changed, 16 insertions(+), 44 deletions(-)
 delete mode 100644 test_client/tests/res/values/setup.xml

diff --git a/test_client/custom_rules.xml b/test_client/custom_rules.xml
index 0d50badc..cb014b3a 100644
--- a/test_client/custom_rules.xml
+++ b/test_client/custom_rules.xml
@@ -43,5 +43,19 @@
 				byline="true" />
 			</then>
 		</if>
+		
+		<!-- Make Travis build number available to the test app in the emulator -->
+		<if>
+			<condition>
+				<isset property="env.TRAVIS_BUILD_NUMBER" />
+			</condition>
+			<then>
+				<replaceregexp
+				file="res/values/setup.xml"
+				match='("build_number"&gt;)\s*(&lt;)'
+				replace="\1${env.TRAVIS_BUILD_NUMBER}\2"
+				byline="true" />
+			</then>
+		</if>
 	</target>
 </project>
\ No newline at end of file
diff --git a/test_client/res/values/setup.xml b/test_client/res/values/setup.xml
index ac5cedde..4c54c7f9 100644
--- a/test_client/res/values/setup.xml
+++ b/test_client/res/values/setup.xml
@@ -24,6 +24,7 @@
  -->
  
 <resources>
+    <string name="build_number"></string>
     <string name="server_base_url"></string>
     <string name="username"></string>
     <string name="password"></string>
diff --git a/test_client/tests/custom_rules.xml b/test_client/tests/custom_rules.xml
index 9b2ff335..1849940c 100644
--- a/test_client/tests/custom_rules.xml
+++ b/test_client/tests/custom_rules.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="custom_rules">
 	
-	<target name="-pre-build" >
-		<!-- Make Travis build number available to the test app in the emulator -->
-		<if>
-			<condition>
-				<isset property="env.TRAVIS_BUILD_NUMBER" />
-			</condition>
-			<then>
-				<replaceregexp
-				file="res/values/setup.xml"
-				match='("build_number"&gt;)\s*(&lt;)'
-				replace="\1${env.TRAVIS_BUILD_NUMBER}\2"
-				byline="true" />
-			</then>
-		</if>
-	</target>
-	
 	<!-- Run regular Android target 'test', but fails if any test is not successful -->
 	<target name="acceptance-test" depends="clean, debug, install" >
 		<property name="log.file" value="tests_output.txt" />
diff --git a/test_client/tests/res/values/setup.xml b/test_client/tests/res/values/setup.xml
deleted file mode 100644
index 08bb772b..00000000
--- a/test_client/tests/res/values/setup.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  ownCloud Android Library is available under MIT license
-   Copyright (C) 2014 ownCloud Inc.
-    
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-   
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-   
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
- -->
- 
-<resources>
-    <string name="build_number"></string>
-</resources>
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java
index a1b60f09..5f826f74 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java
@@ -28,6 +28,7 @@ import android.content.Context;
 import android.util.Log;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.test_project.R;
 
 public class Utils {