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
uses lists instead dict and fixes python 2 compatibility
  • Loading branch information
Fede A committed Apr 16, 2020
commit 56c526d4482de1f8d4defcad72b90587a51d674c
46 changes: 16 additions & 30 deletions tests/tests_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@
# ------------------------------------------------------------------------------

# Custom writeObject parsing classes

def assign_dict(fields, values):
ret = dict()
for i, v in enumerate(fields):
ret[v] = values[i]
return ret

class CustomWriterInstance(javaobj.beans.JavaInstance):
def __init__(self):
javaobj.beans.JavaInstance.__init__(self)
Expand All @@ -84,7 +77,7 @@ def load_from_instance(self):
'>i', BytesIO(raw_data[0].data).read(4))[0]
custom_obj = raw_data[1]
values = [int_not_in_fields, custom_obj]
self.field_data = assign_dict(fields, values)
self.field_data = dict(zip(fields, values))
return True

return False
Expand All @@ -100,15 +93,16 @@ 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 = assign_dict(fields, list(values))
self.field_data = dict(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 = assign_dict(super_class.fields_names, super_class.field_data)
self.annotations = dict(zip(super_class.fields_names, super_class.field_data))
return True

return False


__metaclass__ = type
class BaseTransformer(javaobj.transformers.ObjectTransformer):
"""
Creates a JavaInstance object with custom loading methods for the
Expand Down Expand Up @@ -147,19 +141,20 @@ class JavaRandomTransformer(BaseTransformer):
def __init__(self):
super(JavaRandomTransformer, self).__init__()
self.name = "java.util.Random"
self.fields = {
'haveNextNextGaussian': javaobj.beans.FieldType.BOOLEAN,
'nextNextGaussian': javaobj.beans.FieldType.DOUBLE,
'seed': javaobj.beans.FieldType.LONG
}
self.field_names = ['haveNextNextGaussian', 'nextNextGaussian', 'seed']
self.field_types = [
javaobj.beans.FieldType.BOOLEAN,
javaobj.beans.FieldType.DOUBLE,
javaobj.beans.FieldType.LONG
]

def load_custom_writeObject(self, parser, reader, name):
if name == self.name:
fields = []
values = []
for field_name, field_type in self.fields.items():
values.append(parser._read_field_value(field_type))
fields.append(javaobj.beans.JavaField(field_type, field_name))
for index, value in enumerate(self.field_types):
values.append(parser._read_field_value(value))
fields.append(javaobj.beans.JavaField(value, self.field_names[index]))

class_desc = javaobj.beans.JavaClassDesc(
javaobj.beans.ClassDescType.NORMALCLASS)
Expand Down Expand Up @@ -575,18 +570,9 @@ def test_writeObject(self):
}
}

self.assertEqual(expected['int_not_in_fields'],
parent_data['int_not_in_fields'])
self.assertEqual(expected['custom_obj']
['field_data']['doub'], child_data['doub'])
self.assertEqual(expected['custom_obj']
['field_data']['num'], child_data['num'])
self.assertEqual(expected['custom_obj']['annotations']
['haveNextNextGaussian'], super_data['haveNextNextGaussian'])
self.assertEqual(expected['custom_obj']['annotations']
['nextNextGaussian'], super_data['nextNextGaussian'])
self.assertEqual(expected['custom_obj']
['annotations']['seed'], super_data['seed'])
self.assertEqual(expected['int_not_in_fields'], parent_data['int_not_in_fields'])
self.assertEqual(expected['custom_obj']['field_data'], child_data)
self.assertEqual(expected['custom_obj']['annotations'], super_data)

# ------------------------------------------------------------------------------

Expand Down