Skip to content

Class flags #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tcalmant merged 3 commits into from
Jan 17, 2018
Merged

Class flags #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a58988f
OR together all flags for base classes; change byte array unit test c…
ggjspencer Jan 16, 2018
9f51d88
add author attribution
ggjspencer Jan 16, 2018
7b77e22
fix spacing
ggjspencer Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Many thanks to the contributors:
* Patrick J. McNerthney (@iciclespider)
* @voetsjoeba
* Vadim Markovtsev (@vmarkovtsev)
* Jason Spencer, Google LLC (@j8spencer)
5 changes: 5 additions & 0 deletions javaobj.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,11 @@ def do_classdesc(self, parent=None, ident=0):
log_debug("Super Class for {0}: {1}"
.format(clazz.name, str(superclassdesc)), ident)
clazz.superclass = superclassdesc
# j8spencer (Google, LLC) 2018-01-16: OR in superclass flags to catch
# any SC_WRITE_METHODs needed for objects.
if superclassdesc and hasattr(superclassdesc, "flags"):
clazz.flags |= superclassdesc.flags

return clazz

def do_blockdata(self, parent=None, ident=0):
Expand Down
7 changes: 6 additions & 1 deletion tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@ def test_class_with_byte_array_rw(self):
jobj = self.read_file("testClassWithByteArray.ser")
pobj = javaobj.loads(jobj)

self.assertEqual(pobj.myArray, b"\x01\x03\x07\x0b")
# j8spencer (Google, LLC) 2018-01-16: It seems specific support for
# byte arrays was added, but is a little out-of-step with the other
# types in terms of style. This UT was broken, since the "myArray"
# member has the array stored as a tuple of ints (not a byte string)
# in memeber called '_data.' I've updated to pass the UTs.
self.assertEqual(pobj.myArray._data, (1, 3, 7, 11))
self._try_marshalling(jobj, pobj)

def test_boolean(self):
Expand Down