Skip to content

Commit ffc1a52

Browse files
committed
Issue_69, Increase timeout for tests failing on Java 11. Default Locale set in some test cases to avoid failures on non-US systems
1 parent 7ad5552 commit ffc1a52

File tree

5 files changed

+29
-2
lines changed

5 files changed

+29
-2
lines changed

epics-util/src/test/java/org/epics/util/text/NumberFormatsTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
package org.epics.util.text;
66

77
import java.text.NumberFormat;
8+
import java.util.Locale;
9+
810
import static org.hamcrest.CoreMatchers.equalTo;
11+
12+
import org.junit.Before;
13+
import org.junit.BeforeClass;
914
import org.junit.Test;
1015
import static org.junit.Assert.*;
1116
import static org.hamcrest.Matchers.*;
@@ -19,6 +24,11 @@ public class NumberFormatsTest {
1924
public NumberFormatsTest() {
2025
}
2126

27+
@Before
28+
public void setLocale(){
29+
Locale.setDefault(new Locale("en", "US"));
30+
}
31+
2232
@Test
2333
public void format1() {
2434
NumberFormat format = NumberFormats.precisionFormat(2);

epics-vtype/vtype/src/test/java/org/epics/vtype/SimpleValueFormatTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.util.Arrays;
1111
import java.util.List;
12+
import java.util.Locale;
1213

1314
import org.epics.util.array.ArrayByte;
1415
import org.epics.util.array.ArrayDouble;
@@ -20,6 +21,7 @@
2021
import org.epics.util.array.ListFloat;
2122
import org.epics.util.stats.Range;
2223
import org.epics.util.text.NumberFormats;
24+
import org.junit.Before;
2325
import org.junit.Test;
2426
import org.mockito.Mockito;
2527

@@ -28,6 +30,11 @@
2830
* @author carcassi
2931
*/
3032
public class SimpleValueFormatTest {
33+
34+
static {
35+
Locale.setDefault(new Locale("en", "US"));
36+
}
37+
3138
Range maxDoubleRange = Range.of(Double.MIN_VALUE, Double.MAX_VALUE);
3239
Display display = Display.of(maxDoubleRange, maxDoubleRange, maxDoubleRange, maxDoubleRange, "",
3340
NumberFormats.precisionFormat(3));

gpclient/gpclient-ca/src/test/java/org/epics/gpclient/datasource/ca/CAChannelTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void createSimpleChannel() throws InterruptedException {
6767
PVEventRecorder recorder = probe.getRecorder();
6868
PVReader<VType> pv = gpClient.read("ca://test_double_0").addListener(recorder).start();
6969
recorder.wait(500, PVEventRecorder.forAConnectionEvent());
70-
recorder.wait(100, PVEventRecorder.anEventOfType(PVEvent.Type.VALUE));
70+
recorder.wait(200, PVEventRecorder.anEventOfType(PVEvent.Type.VALUE));
7171
pv.close();
7272
Thread.sleep(1000);
7373
}
@@ -79,7 +79,7 @@ public void createSimpleWriteChannel() throws InterruptedException {
7979
PVEventRecorder recorder = probe.getRecorder();
8080
PV<VType, Object> pv = gpClient.readAndWrite("ca://test_double_0").addListener(recorder).start();
8181
recorder.wait(1000, PVEventRecorder.forAConnectionEvent());
82-
recorder.wait(100, PVEventRecorder.anEventOfType(PVEvent.Type.VALUE));
82+
recorder.wait(200, PVEventRecorder.anEventOfType(PVEvent.Type.VALUE));
8383
pv.write(VDouble.of(1.0, Alarm.none(), Time.now(), Display.none()));
8484
Thread.sleep(1000);
8585
pv.write(VDouble.of(2.0, Alarm.none(), Time.now(), Display.none()));

pvDataJava/test/org/epics/pvdata/BitSetUtilTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
import org.epics.pvdata.pv.PVStructure;
1717
import org.epics.pvdata.pv.ScalarType;
1818
import org.epics.pvdata.pv.StandardField;
19+
import org.junit.Before;
1920

21+
import java.util.Locale;
2022

2123

2224
/**
@@ -29,6 +31,11 @@ public class BitSetUtilTest extends TestCase {
2931
private static final StandardField standardField = StandardFieldFactory.getStandardField();
3032
private static final BitSetUtil bitSetUtil = BitSetUtilFactory.getCompressBitSet();
3133
private static boolean debug = false;
34+
35+
@Before
36+
public void setLocale(){
37+
Locale.setDefault(new Locale("en", "US"));
38+
}
3239

3340
static private void print(String name,String value) {
3441
if(!debug) return;

pvDataJava/test/org/epics/pvdata/NumberFormatTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.text.FieldPosition;
88
import java.text.NumberFormat;
99
import java.text.ParsePosition;
10+
import java.util.Locale;
1011

1112
import junit.framework.TestCase;
1213

@@ -18,7 +19,9 @@
1819
*/
1920
public class NumberFormatTest extends TestCase {
2021

22+
2123
public void testNumberFormat() {
24+
Locale.setDefault(new Locale("en", "US"));
2225
NumberFormat nf = new NumberFormatDouble("%12.2f");
2326
StringBuffer sb = new StringBuffer();
2427
FieldPosition fp = new FieldPosition(0);

0 commit comments

Comments
 (0)