summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Trimble2014-05-09 15:03:48 (EDT)
committerIan Trimble2014-05-09 15:03:48 (EDT)
commitf74f18ff5362777aa93226e72672da42a1baabe6 (patch)
tree90c3b278b381e5a7e72202105d90193b2835d9f7
parentec52b37b2bc605207a216863df7d899d7a029024 (diff)
downloadwebtools.jsf.tests-f74f18ff5362777aa93226e72672da42a1baabe6.zip
webtools.jsf.tests-f74f18ff5362777aa93226e72672da42a1baabe6.tar.gz
webtools.jsf.tests-f74f18ff5362777aa93226e72672da42a1baabe6.tar.bz2
Fix JSF tests failing in CBI build.HEADv201405091204R3_6_0master
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/read/ReadNavigationRuleTestCase.java2
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml2
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml2
-rw-r--r--jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_2_0.xml2
4 files changed, 4 insertions, 4 deletions
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/read/ReadNavigationRuleTestCase.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/read/ReadNavigationRuleTestCase.java
index fdf1e55..7365a70 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/read/ReadNavigationRuleTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/src/org/eclipse/jst/jsf/facesconfig/tests/read/ReadNavigationRuleTestCase.java
@@ -78,7 +78,7 @@ public class ReadNavigationRuleTestCase extends BaseReadTestCase {
assertEquals("en", displayNameType.getLang());
displayNameType = FacesConfigModelUtil.
- findDisplayNameType(navRule.getDisplayName(), "Nom D'Affichage De Franšais");
+ findDisplayNameType(navRule.getDisplayName(), "Nom D'Affichage De Francais");
assertNotNull(displayNameType);
assertEquals("fr", displayNameType.getLang());
} finally {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml
index e777aec..a9c8a52 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml
@@ -382,7 +382,7 @@
<description xml:lang="en-GB">What colour is it?</description>
<description xml:lang="fr">Quelle couleur est lui?</description>
<display-name xml:lang="en">English Display Name</display-name>
- <display-name xml:lang="fr">Nom D'Affichage De Fran├žais</display-name>
+ <display-name xml:lang="fr">Nom D'Affichage De Francais</display-name>
<icon xml:lang="en">
<small-icon>en_small-icon</small-icon>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml
index 2c46e99..89fb9b1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml
@@ -402,7 +402,7 @@
<description xml:lang="en-GB">What colour is it?</description>
<description xml:lang="fr">Quelle couleur est lui?</description>
<display-name xml:lang="en">English Display Name</display-name>
- <display-name xml:lang="fr">Nom D'Affichage De Fran├žais</display-name>
+ <display-name xml:lang="fr">Nom D'Affichage De Francais</display-name>
<icon xml:lang="en">
<small-icon>en_small-icon</small-icon>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_2_0.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_2_0.xml
index 72e48bf..f42756a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_2_0.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_2_0.xml
@@ -490,7 +490,7 @@
<description xml:lang="en-GB">What colour is it?</description>
<description xml:lang="fr">Quelle couleur est lui?</description>
<display-name xml:lang="en">English Display Name</display-name>
- <display-name xml:lang="fr">Nom D'Affichage De Fran├žais</display-name>
+ <display-name xml:lang="fr">Nom D'Affichage De Francais</display-name>
<icon xml:lang="en">
<small-icon>en_small-icon</small-icon>