The branch, master has been updated via 0d7abd22d429a86bf88f05ee5e04248df1d701d5 (commit) from 6dbd2687823a3cca73dc0427d31ce82b5a217b97 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=0d7abd22d429a86bf88f05ee5e... http://github.com/ceki/cal10n/commit/0d7abd22d429a86bf88f05ee5e04248df1d701d... commit 0d7abd22d429a86bf88f05ee5e04248df1d701d5 Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Sep 2 22:34:21 2009 +0200 - minor changes diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java index 8c6c818..978e507 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java @@ -22,8 +22,8 @@ package ch.qos.cal10n; -import static org.junit.Assert.*; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; @@ -40,8 +40,6 @@ import ch.qos.cal10n.util.MiscUtil; public class MessageConveyorReloadTest { - - @Test public void bundleReload() throws IOException, InterruptedException { ClassLoader classLoader = this.getClass().getClassLoader(); @@ -50,7 +48,6 @@ public class MessageConveyorReloadTest { assertNotNull("the problem is in this test, not the code tested", url); MessageConveyor mc = new MessageConveyor(new Locale("en")); - mc.getMessage(Colors.BLUE); CAL10NPropertyResourceBundle initalRB = mc.cache.get(Colors.BLUE.getDeclaringClass().getName()); diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java index 0f1c026..5726920 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java @@ -23,20 +23,14 @@ package ch.qos.cal10n; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URL; import java.util.Locale; import org.junit.Test; import ch.qos.cal10n.sample.Colors; import ch.qos.cal10n.sample.Host.OtherColors; -import ch.qos.cal10n.util.MiscUtil; public class MessageConveyorTest { @@ -111,15 +105,4 @@ public class MessageConveyorTest { } } - @Test - public void bundleReload() throws IOException { - ClassLoader classLoader = this.getClass().getClassLoader(); - String resourceCandidate = "colors" + "_" + "en" + ".properties"; - URL url = classLoader.getResource(resourceCandidate); - assertNotNull("the problem is in this test, not the code tested", url); - - File file = MiscUtil.urlToFile(url); - FileOutputStream fos = new FileOutputStream(file, true); - assertNotNull(file); - } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java index 739a19e..be736c8 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java @@ -27,6 +27,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { MessageConveyorTest.class }) +@SuiteClasses( { MessageConveyorTest.class, MessageConveyorReloadTest.class }) public class PackageTest { } ----------------------------------------------------------------------- Summary of changes: .../ch/qos/cal10n/MessageConveyorReloadTest.java | 5 +---- .../java/ch/qos/cal10n/MessageConveyorTest.java | 17 ----------------- .../src/test/java/ch/qos/cal10n/PackageTest.java | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) hooks/post-receive -- Compiler assisted localization library