Commit 4541906c authored by Masanori Ogino's avatar Masanori Ogino
Browse files

Skip tests if it includes unsupported locale/charset

A device may not support any specific locale (i.e. China, German, etc,.)

Change-Id: I894bfc76d3503d879913ff33a2b5e8887ea2ca49
parent aa2be6b8
......@@ -423,14 +423,14 @@ public class InputStreamReaderTest extends TestCase {
"tests/api/java/io/testfile.txt");
try {
reader = new InputStreamReader(in, "gb18030");
while ((c = reader.read()) != -1) {
sb.append((char) c);
}
assertEquals(source, sb.toString());
} catch (UnsupportedEncodingException e) {
System.out
.println("GB18030 is not supported, abort test InputStreamReaderTest.testSpecialCharsetReading().");
}
while ((c = reader.read()) != -1) {
sb.append((char) c);
}
assertEquals(source, sb.toString());
}
/**
......
......@@ -17,6 +17,7 @@
package org.apache.harmony.luni.tests.java.lang;
import java.io.Serializable;
import java.nio.charset.Charset;
import junit.framework.TestCase;
......@@ -97,10 +98,12 @@ public class StringBufferTest extends TestCase {
buffer.append("abcde");
assertEquals("abcde", buffer.toString());
buffer.setLength(1000);
byte[] bytes = buffer.toString().getBytes("GB18030");
for (int i = 5; i < bytes.length; i++) {
assertEquals(0, bytes[i]);
if (Charset.isSupported("GB18030")) {
buffer.setLength(1000);
byte[] bytes = buffer.toString().getBytes("GB18030");
for (int i = 5; i < bytes.length; i++) {
assertEquals(0, bytes[i]);
}
}
buffer.setLength(5);
......
......@@ -19,7 +19,7 @@ package org.apache.harmony.luni.tests.java.lang;
import java.io.Serializable;
import java.util.Arrays;
import java.nio.charset.Charset;
import junit.framework.TestCase;
import org.apache.harmony.testframework.serialization.SerializationTest;
......@@ -1912,10 +1912,12 @@ public class StringBuilderTest extends TestCase {
sb.setLength(0);
sb.append("abcde");
assertEquals("abcde", sb.toString());
sb.setLength(1000);
byte[] bytes = sb.toString().getBytes("GB18030");
for (int i = 5; i < bytes.length; i++) {
assertEquals(0, bytes[i]);
if (Charset.isSupported("GB18030")) {
sb.setLength(1000);
byte[] bytes = sb.toString().getBytes("GB18030");
for (int i = 5; i < bytes.length; i++) {
assertEquals(0, bytes[i]);
}
}
sb.setLength(5);
......
......@@ -29,6 +29,8 @@ import java.util.TimeZone;
import org.apache.harmony.testframework.serialization.SerializationTest;
import tests.support.Support_Locale;
public class CalendarTest extends junit.framework.TestCase {
Locale defaultLocale;
......@@ -653,12 +655,16 @@ public class CalendarTest extends junit.framework.TestCase {
*/
public void test_getInstance() {
// test getInstance(Locale)
Calendar us_calendar = Calendar.getInstance(Locale.US);
Calendar ch_calendar = Calendar.getInstance(Locale.CHINESE);
assertEquals(Calendar.SUNDAY, us_calendar
.getFirstDayOfWeek());
assertEquals(Calendar.MONDAY, ch_calendar
.getFirstDayOfWeek());
if (Support_Locale.areLocalesAvailable(Locale.US)) {
Calendar us_calendar = Calendar.getInstance(Locale.US);
assertEquals(Calendar.SUNDAY, us_calendar
.getFirstDayOfWeek());
}
if (Support_Locale.areLocalesAvailable(Locale.CHINESE)) {
Calendar ch_calendar = Calendar.getInstance(Locale.CHINESE);
assertEquals(Calendar.MONDAY, ch_calendar
.getFirstDayOfWeek());
}
// test getInstance(Locale, TimeZone)
Calendar gmt_calendar = Calendar.getInstance(TimeZone
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment