You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2015/11/06 18:26:05 UTC

[1/2] incubator-geode git commit: GEODE-532 Remove testDefaults in BasicI18nJUnitTest

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 1b8a35734 -> 8fe291010


GEODE-532 Remove testDefaults in BasicI18nJUnitTest


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/66d9da67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/66d9da67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/66d9da67

Branch: refs/heads/develop
Commit: 66d9da67570ed915ad4e479a94c7b1c3c081d6d8
Parents: e9aa18b
Author: shtykh_roman <rs...@yahoo.com>
Authored: Fri Nov 6 11:13:21 2015 +0900
Committer: shtykh_roman <rs...@yahoo.com>
Committed: Fri Nov 6 11:13:21 2015 +0900

----------------------------------------------------------------------
 .../gemfire/internal/i18n/BasicI18nJUnitTest.java       | 12 ------------
 1 file changed, 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/66d9da67/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
index 806c51e..28934b3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
@@ -209,18 +209,6 @@ public class BasicI18nJUnitTest extends TestCase {
     StringIdImpl.setLocale(DEFAULT_LOCALE);
   }
 
-  public void testDefaults() {
-    Locale l = getCurrentLocale();
-    AbstractStringIdResourceBundle r = getActiveResourceBundle();
-    assertNotNull(l);
-    assertNotNull(r);
-    final String currentLang = l.getLanguage();
-    final String expectedLang = new Locale("en", "", "").getLanguage();
-    final String frenchLang = new Locale("fr", "", "").getLanguage();
-    // TODO this will fail if run under a locale with a language other than french or english
-    assertTrue(currentLang.equals(expectedLang) || currentLang.equals(frenchLang));
-  }
-
   public void testSetLocale() {
     //Verify we are starting in a known state
     assertTrue(DEFAULT_LOCALE.equals(getCurrentLocale()));


[2/2] incubator-geode git commit: Merge commit 'refs/pull/30/head' of https://github.com/apache/incubator-geode into develop

Posted by up...@apache.org.
Merge commit 'refs/pull/30/head' of https://github.com/apache/incubator-geode into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8fe29101
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8fe29101
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8fe29101

Branch: refs/heads/develop
Commit: 8fe291010f7b97f8a28f30c0c4929d09abef7d39
Parents: 1b8a357 66d9da6
Author: Dan Smith <up...@apache.org>
Authored: Fri Nov 6 09:24:42 2015 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Fri Nov 6 09:24:42 2015 -0800

----------------------------------------------------------------------
 .../gemfire/internal/i18n/BasicI18nJUnitTest.java       | 12 ------------
 1 file changed, 12 deletions(-)
----------------------------------------------------------------------