From 7e5bdf7abe182a2c6926ba26a6f84039dd56a2b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 24 Aug 2015 09:22:12 -0400 Subject: [PATCH] contrib/mnit_test: deactivate the res/strings test to enable app_name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- contrib/mnit_test/res/values/strings.xml | 6 ------ .../mnit_test/src/test_assets_and_resources.nit | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 contrib/mnit_test/res/values/strings.xml 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 @@ - - - mnit Simple - Test Resources - string test - 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 -- 1.7.9.5