@@ -53,14 +53,16 @@ def test_transform_data_new_col(self):
5353 field_name , data , err = transform_data (data , transformer )
5454
5555 expect_name = [u'path' ,u'about_resource' , u'name' ,u'version' ,u'notes' ,u'temp' ]
56- expected_data = [OrderedDict ([(u'path' , u'/tmp/test.c' ), (u'about_resource' , u'/tmp/test.c' ), (u'name' , u'test.c' ),
57- (u'version' , u'1' ),(u'notes' , u'test' ),(u'temp' , u'foo' )])]
56+ expected_data = [dict (OrderedDict ([(u'path' , u'/tmp/test.c' ),
57+ (u'about_resource' , u'/tmp/test.c' ),
58+ (u'name' , u'test.c' ), (u'version' , u'1' ),
59+ (u'notes' , u'test' ),(u'temp' , u'foo' )]))]
5860 assert len (field_name ) == len (expect_name )
5961 for name in field_name :
6062 assert name in expect_name
6163 assert len (data ) == len (expected_data )
6264 for d in data :
63- assert d in expected_data
65+ assert dict ( d ) in expected_data
6466
6567 def test_transform_data (self ):
6668 data = [OrderedDict ([(u'Directory/Filename' , u'/tmp/test.c' ),
@@ -72,14 +74,14 @@ def test_transform_data(self):
7274 field_name , data , err = transform_data (data , transformer )
7375
7476 expect_name = [u'about_resource' , u'name' , u'version' ]
75- expected_data = [OrderedDict ([(u'about_resource' , u'/tmp/test.c' ), (u'name' , u'test.c' ), (u'version' , u'1' )])]
77+ expected_data = [dict ( OrderedDict ([(u'about_resource' , u'/tmp/test.c' ), (u'name' , u'test.c' ), (u'version' , u'1' )]) )]
7678
7779 assert len (field_name ) == len (expect_name )
7880 for name in field_name :
7981 assert name in expect_name
8082 assert len (data ) == len (expected_data )
8183 for d in data :
82- assert d in expected_data
84+ assert dict ( d ) in expected_data
8385
8486 def test_transform_data_mutli_rows (self ):
8587 data = [OrderedDict ([(u'Directory/Filename' , u'/tmp/test.c' ), (u'Component' , u'test.c' ), (u'Confirmed Version' , u'v0.01' )]),
@@ -90,15 +92,15 @@ def test_transform_data_mutli_rows(self):
9092 field_name , data , err = transform_data (data , transformer )
9193
9294 expect_name = [u'about_resource' , u'name' , u'version' ]
93- expected_data = [OrderedDict ([(u'about_resource' , u'/tmp/test.c' ), (u'name' , u'test.c' ), (u'version' , u'v0.01' )]),
94- OrderedDict ([(u'about_resource' , u'/tmp/tmp.h' ), (u'name' , u'tmp.h' ), (u'version' , None )])]
95+ expected_data = [dict ( OrderedDict ([(u'about_resource' , u'/tmp/test.c' ), (u'name' , u'test.c' ), (u'version' , u'v0.01' )]) ),
96+ dict ( OrderedDict ([(u'about_resource' , u'/tmp/tmp.h' ), (u'name' , u'tmp.h' ), (u'version' , None )]) )]
9597
9698 assert len (field_name ) == len (expect_name )
9799 for name in field_name :
98100 assert name in expect_name
99101 assert len (data ) == len (expected_data )
100102 for d in data :
101- assert d in expected_data
103+ assert dict ( d ) in expected_data
102104
103105 def test_normalize_dict_data_scancode (self ):
104106 test_file = get_test_loc ('test_transform/input_scancode.json' )
0 commit comments