From: Alexis Laferrière <alexis.laf@xymus.net>
Date: Mon, 24 Aug 2015 13:22:12 +0000 (-0400)
Subject: contrib/mnit_test: deactivate the res/strings test to enable app_name
X-Git-Tag: v0.7.8~68^2~7
X-Git-Url: http://nitlanguage.org

contrib/mnit_test: deactivate the res/strings test to enable app_name

Defining a custom res/values/strings.xml prevents nitc from generating a
custom one with the annotation app_name as the resource app_name. This
kept use from having different launcher names for the minimal and
complete test versions.

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---

diff --git a/contrib/mnit_test/res/values/strings.xml b/contrib/mnit_test/res/values/strings.xml
deleted file mode 100644
index 6ef469c..0000000
--- a/contrib/mnit_test/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name"> mnit Simple</string>
-    <string name="nit_string">Test Resources</string>
-    <string name="string_test">string test</string>
-</resources>
diff --git a/contrib/mnit_test/src/test_assets_and_resources.nit b/contrib/mnit_test/src/test_assets_and_resources.nit
index ad2ff09..5e7cbd7 100644
--- a/contrib/mnit_test/src/test_assets_and_resources.nit
+++ b/contrib/mnit_test/src/test_assets_and_resources.nit
@@ -38,7 +38,10 @@ redef class App
 
 	# Testing the resources manager
 	fun test_resources do
-		assert resource_manager.string("string_test") == "string test"
+		# FIXME test deactivated to use app_name which is incompatible
+		# with a custom res/values/strings.xml
+		#assert resource_manager.string("string_test") == "string test"
+
 		assert resource_manager.boolean("test_bool") == true
 		assert resource_manager.dimension("test_dimen_1") == 25
 		assert resource_manager.dimension("test_dimen_2") == 150