X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=core%2Ftest%2Fnet%2Fsf%2Fopenrocket%2Fl10n%2FTestResourceBundleTranslator.java;fp=core%2Ftest%2Fnet%2Fsf%2Fopenrocket%2Fl10n%2FTestResourceBundleTranslator.java;h=992bcc2cea54eff9de69a90e7816b8ede16f8f03;hb=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hp=db7dbfc79bde1eab057ec5992866f85e21e05d7e;hpb=30ba0a882f0c061176ba14dbf86d3d6fad096c02;p=debian%2Fopenrocket

diff --git a/core/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java b/core/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java
index db7dbfc7..992bcc2c 100644
--- a/core/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java
+++ b/core/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java
@@ -5,18 +5,35 @@ import static org.junit.Assert.*;
 import java.util.Locale;
 import java.util.MissingResourceException;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class TestResourceBundleTranslator {
 	
+	private Locale originalDefaultLocale;
+	
+	@Before
+	public void setup() {
+		// Default locale affects resource bundles, so set something non-English
+		this.originalDefaultLocale = Locale.getDefault();
+		Locale.setDefault(Locale.GERMAN);
+	}
+	
+	@After
+	public void teardown() {
+		Locale.setDefault(originalDefaultLocale);
+	}
+	
+	
 	@Test
-	public void testSuccessfulUS() {
-		ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.US);
-		assertEquals("messages.properties", trans.get("debug.currentFile"));
+	public void testSuccessfulDefault() {
+		ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages");
+		assertEquals("messages_de.properties", trans.get("debug.currentFile"));
 	}
 	
 	@Test
-	public void testSuccessfulFR() {
+	public void testSuccessfulNonDefault() {
 		ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH);
 		assertEquals("messages_fr.properties", trans.get("debug.currentFile"));
 	}
@@ -31,4 +48,20 @@ public class TestResourceBundleTranslator {
 		}
 	}
 	
+	@Test
+	public void testGetEnglish() {
+		ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH);
+		assertEquals("Papier (bureau)", trans.get("material", "Paper (office)"));
+		assertEquals("Paper (toilet)", trans.get("material", "Paper (toilet)"));
+	}
+	
+	
+	@Test
+	public void testGetBase() {
+		ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH);
+		assertEquals("Paper (office)", trans.getBaseText("material", "Papier (bureau)"));
+		assertEquals("Papier (toilet)", trans.getBaseText("material", "Papier (toilet)"));
+	}
+	
+	
 }