Skip to content

Add tests for PR #38 #40

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

Closed
urucoder wants to merge 11 commits into from
Closed

Add tests for PR #38 #40

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d44f84b
adds suport for SC_WRITE_METHOD
Apr 9, 2020
3d0a1a4
removes unused parameter
Apr 9, 2020
574b076
fixes _read_class_data
Apr 13, 2020
2b3593b
main project sync
Apr 13, 2020
fd30e4e
adds tests for custom writeObject
Apr 15, 2020
e7a231c
switch dict for OrderedDict for backward compatibility
Apr 16, 2020
9dab084
revert OrderedDict and instead use dict names
Apr 16, 2020
c74e612
custom dict construction
Apr 16, 2020
56c526d
uses lists instead dict and fixes python 2 compatibility
Apr 16, 2020
c7ebb0e
extends from object on ObjectTransformer for python2 compatibility
Apr 16, 2020
80acea1
removes dict values call
Apr 16, 2020
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
Prev Previous commit
Next Next commit
switch dict for OrderedDict for backward compatibility
  • Loading branch information
Fede A committed Apr 16, 2020
commit e7a231c930a8225a1e21a634a6bf5ca23fdd8a08
11 changes: 6 additions & 5 deletions tests/tests_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import unittest
import struct

from collections import OrderedDict
from io import BytesIO

# Prepare Python path to import javaobj
Expand Down Expand Up @@ -76,7 +77,7 @@ def load_from_instance(self):
int_not_in_fields = struct.unpack('>i', BytesIO(raw_data[0].data).read(4))[0]
custom_obj = raw_data[1]
values = [int_not_in_fields, custom_obj]
self.field_data = dict(zip(fields, values))
self.field_data = OrderedDict(zip(fields, values))
return True

return False
Expand All @@ -91,10 +92,10 @@ def load_from_instance(self):
if self.classdesc and self.classdesc in self.field_data:
fields = self.classdesc.fields_names
values = self.field_data[self.classdesc].values()
self.field_data = dict(zip(fields, values))
self.field_data = OrderedDict(zip(fields, values))
if self.classdesc.super_class and self.classdesc.super_class in self.annotations:
super_class = self.annotations[self.classdesc.super_class][0]
self.annotations = dict(
self.annotations = OrderedDict(
zip(super_class.fields_names, super_class.field_data))
return True

Expand Down Expand Up @@ -545,7 +546,7 @@ def test_writeObject(self):
parent_data = pobj.field_data
child_data = parent_data['custom_obj'].field_data
super_data = parent_data['custom_obj'].annotations
expected = {
expected = OrderedDict({
'int_not_in_fields': 0,
'custom_obj': {
'field_data': {
Expand All @@ -558,7 +559,7 @@ def test_writeObject(self):
'seed': 25214903879
}
}
}
})

self.assertEqual(expected['int_not_in_fields'], parent_data['int_not_in_fields'])
self.assertEqual(expected['custom_obj']['field_data'], child_data)
Expand Down