mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-15 21:12:15 +00:00
[FIXED HUDSON-2843] Util.getTimeSpanString() got exception for times <10 sec
on locales with comma as fraction separator. Now passing time value to localizer as float instead of String. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14480 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
1d6df45049
commit
b656cd8567
2 files changed
+13
-3
No files matched your search
@@ -4,6 +4,7 @@ import junit.framework.TestCase;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* @author Kohsuke Kawaguchi
|
||||
@@ -60,11 +61,20 @@ public class UtilTest extends TestCase {
|
||||
// 171ms -> 0.17sec
|
||||
assertEquals(Messages.Util_second(0.17), Util.getTimeSpanString(171L));
|
||||
// 101ms -> 0.10sec
|
||||
assertEquals(Messages.Util_second("0.10"), Util.getTimeSpanString(101L));
|
||||
assertEquals(Messages.Util_second(0.1), Util.getTimeSpanString(101L));
|
||||
// 17ms
|
||||
assertEquals(Messages.Util_millisecond(17), Util.getTimeSpanString(17L));
|
||||
// 1ms
|
||||
assertEquals(Messages.Util_millisecond(1), Util.getTimeSpanString(1L));
|
||||
// Test HUDSON-2843 (locale with comma as fraction separator got exception for <10 sec)
|
||||
Locale saveLocale = Locale.getDefault();
|
||||
Locale.setDefault(Locale.GERMANY);
|
||||
try {
|
||||
// Just verifying no exception is thrown:
|
||||
assertNotNull("German locale", Util.getTimeSpanString(1234));
|
||||
assertNotNull("German locale <1 sec", Util.getTimeSpanString(123));
|
||||
}
|
||||
finally { Locale.setDefault(saveLocale); }
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user