Skip to content

Commit 6ea61af

Browse files
committed
Use bytes_char in V2 tests
1 parent fdf786a commit 6ea61af

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

tests/tests_v2.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
# Local
4545
import javaobj.v2 as javaobj
46+
from javaobj.utils import bytes_char
4647

4748
# ------------------------------------------------------------------------------
4849

@@ -104,14 +105,14 @@ def test_char_rw(self):
104105
jobj = self.read_file("testChar.ser")
105106
pobj = javaobj.loads(jobj)
106107
_logger.debug("Read char object: %s", pobj)
107-
self.assertEqual(pobj, "\x00C")
108+
self.assertEqual(pobj, b"\x00C")
108109

109110
def test_chars_rw(self):
110111
"""
111112
Reads testChars.ser and checks the serialization process
112113
"""
113114
# Expected string as a UTF-16 string
114-
expected = "python-javaobj".encode("utf-16-be").decode("latin1")
115+
expected = "python-javaobj".encode("utf-16-be")
115116

116117
jobj = self.read_file("testChars.ser")
117118
pobj = javaobj.loads(jobj)
@@ -126,7 +127,7 @@ def test_double_rw(self):
126127
pobj = javaobj.loads(jobj)
127128
_logger.debug("Read double object: %s", pobj)
128129

129-
self.assertEqual(pobj, "\x7f\xef\xff\xff\xff\xff\xff\xff")
130+
self.assertEqual(pobj, b"\x7f\xef\xff\xff\xff\xff\xff\xff")
130131

131132
def test_bytes_rw(self):
132133
"""
@@ -136,7 +137,7 @@ def test_bytes_rw(self):
136137
pobj = javaobj.loads(jobj)
137138
_logger.debug("Read bytes: %s", pobj)
138139

139-
self.assertEqual(pobj, "HelloWorld")
140+
self.assertEqual(pobj, b"HelloWorld")
140141

141142
def test_class_with_byte_array_rw(self):
142143
"""
@@ -160,7 +161,7 @@ def test_boolean(self):
160161
pobj = javaobj.loads(jobj)
161162
_logger.debug("Read boolean object: %s", pobj)
162163

163-
self.assertEqual(pobj, chr(0))
164+
self.assertEqual(pobj, bytes_char(0))
164165

165166
def test_byte(self):
166167
"""
@@ -172,7 +173,7 @@ def test_byte(self):
172173
pobj = javaobj.loads(jobj)
173174
_logger.debug("Read Byte: %r", pobj)
174175

175-
self.assertEqual(pobj, chr(127))
176+
self.assertEqual(pobj, bytes_char(127))
176177

177178
def test_fields(self):
178179
"""

0 commit comments

Comments
 (0)