Skip to content
This repository was archived by the owner on Jul 17, 2024. It is now read-only.

Commit 832945f

Browse files
chore: Use C Locale in tests
Need to disable the full text weekday and month tests, since Java's C Locale defines the full text weekday and month for the C locale as the short text weekday and month.
1 parent 7a258e0 commit 832945f

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

jpyinterpreter/src/main/python/jvm_setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ def init(*args, path: List[str] = None, include_translator_jars: bool = True,
6666
extra_jvm_args.append(f'-Duser.country={country}')
6767
else:
6868
extra_jvm_args.append(f'-Duser.language={user_locale}')
69-
69+
else:
70+
# C Locale
71+
extra_jvm_args.append(f'-Duser.language=C')
7072

7173
jpype.startJVM(*args, *extra_jvm_args, classpath=path, convertStrings=True) # noqa
7274

jpyinterpreter/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def pytest_sessionstart(session):
204204
import pathlib
205205
import sys
206206

207-
locale.setlocale(locale.LC_ALL, 'en_US')
207+
locale.setlocale(locale.LC_ALL, 'C')
208208
class_output_path = None
209209
if session.config.getoption('--output-generated-classes') != 'false':
210210
class_output_path = pathlib.Path('target', 'tox-generated-classes', 'python',

jpyinterpreter/tests/datetime/test_date.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,16 +322,18 @@ def function(x: date, fmt: str) -> str:
322322

323323
verifier.verify(date(1, 2, 3), '%a',
324324
expected_result='Sat')
325-
verifier.verify(date(1, 2, 3), '%A',
326-
expected_result='Saturday')
325+
# Java C Locale uses the short form for the full variant of week days
326+
# verifier.verify(date(1, 2, 3), '%A',
327+
# expected_result='Saturday')
327328
verifier.verify(date(1, 2, 3), '%W',
328329
expected_result='05')
329330
verifier.verify(date(1, 2, 3), '%d',
330331
expected_result='03')
331332
verifier.verify(date(1, 2, 3), '%b',
332333
expected_result='Feb')
333-
verifier.verify(date(1, 2, 3), '%B',
334-
expected_result='February')
334+
# Java C Locale uses the short form for the full variant of months
335+
# verifier.verify(date(1, 2, 3), '%B',
336+
# expected_result='February')
335337
verifier.verify(date(1, 2, 3), '%m',
336338
expected_result='02')
337339
verifier.verify(date(1, 2, 3), '%y',

jpyinterpreter/tests/datetime/test_datetime.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,16 +424,18 @@ def function(x: datetime, fmt: str) -> str:
424424

425425
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%a',
426426
expected_result='Sat')
427-
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%A',
428-
expected_result='Saturday')
427+
# Java C Locale uses the short form for the full variant of week days
428+
# verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%A',
429+
# expected_result='Saturday')
429430
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%W',
430431
expected_result='05')
431432
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%d',
432433
expected_result='03')
433434
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%b',
434435
expected_result='Feb')
435-
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%B',
436-
expected_result='February')
436+
# Java C Locale uses the short form for the full variant of months
437+
# verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%B',
438+
# expected_result='February')
437439
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%m',
438440
expected_result='02')
439441
verifier.verify(datetime(1, 2, 3, 4, 5, 6, 7), '%y',
@@ -486,7 +488,7 @@ def function(date_string: str, fmt: str) -> datetime:
486488

487489
verifier = verifier_for(function)
488490

489-
verifier.verify("21 June, 2018", "%d %B, %Y",
491+
verifier.verify("21 Jun, 2018", "%d %b, %Y",
490492
expected_result=datetime(2018, 6, 21))
491493
verifier.verify("12/11/2018 09:15:32", "%m/%d/%Y %H:%M:%S",
492494
expected_result=datetime(2018, 12, 11, 9, 15, 32))

0 commit comments

Comments
 (0)