JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-09-19 11:09:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add namespaces to integration tests' "typeName"

Browse Source 
Some integration tests have not been updated since drgn started
reporting type names with all their namespaces, and were failing.
This commit is contained in:
Thierry Treyer 2024-01-10 10:08:44 -08:00 committed by Thierry Treyer
parent cf8fe64d5d
commit d232a5d2fb
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/inheritance_polymorphic.toml
View File

@ -29,7 +29,7 @@ definitions = '''
arg_types = ["A"] arg_types = ["A"]
setup = "return {};" setup = "return {};"
expect_json = '''[{ expect_json = '''[{
"typeName":"A", "typeName":"ns_inheritance_polymorphic::A",
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
@ -48,7 +48,7 @@ definitions = '''
return b; return b;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"B", "typeName":"ns_inheritance_polymorphic::B",
"staticSize":40, "staticSize":40,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -67,7 +67,7 @@ definitions = '''
return b; return b;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"B", "typeName":"ns_inheritance_polymorphic::B",
"staticSize":40, "staticSize":40,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -87,7 +87,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"C", "typeName":"ns_inheritance_polymorphic::C",
"staticSize":48, "staticSize":48,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -107,7 +107,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"C", "typeName":"ns_inheritance_polymorphic::C",
"staticSize":48, "staticSize":48,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -127,7 +127,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"C", "typeName":"ns_inheritance_polymorphic::C",
"staticSize":48, "staticSize":48,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[

22
test/integration/inheritance_polymorphic_diamond.toml
View File

@ -36,7 +36,7 @@ definitions = '''
arg_types = ["Root"] arg_types = ["Root"]
setup = "return {};" setup = "return {};"
expect_json = '''[{ expect_json = '''[{
"typeName":"Root", "typeName":"ns_inheritance_polymorphic_diamond::Root",
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
@ -55,7 +55,7 @@ definitions = '''
return m; return m;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Middle1", "typeName":"ns_inheritance_polymorphic_diamond::Middle1",
"staticSize":40, "staticSize":40,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -67,14 +67,14 @@ definitions = '''
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] cli_options = ["-fpolymorphic-inheritance"]
param_types = ["const Middle1&"] param_types = ["const Middle1&"]
arg_types = ["Middle1"] arg_types = ["ns_inheritance_polymorphic_diamond::Middle1"]
setup = ''' setup = '''
Middle1 m; Middle1 m;
m.vec_middle1 = {1,2,3}; m.vec_middle1 = {1,2,3};
return m; return m;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Middle1", "typeName":"ns_inheritance_polymorphic_diamond::Middle1",
"staticSize":40, "staticSize":40,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -94,7 +94,7 @@ definitions = '''
return m; return m;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Middle2", "typeName":"ns_inheritance_polymorphic_diamond::Middle2",
"staticSize":40, "staticSize":40,
"dynamicSize":8, "dynamicSize":8,
"members":[ "members":[
@ -113,7 +113,7 @@ definitions = '''
return m; return m;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Middle2", "typeName":"ns_inheritance_polymorphic_diamond::Middle2",
"staticSize":40, "staticSize":40,
"dynamicSize":8, "dynamicSize":8,
"members":[ "members":[
@ -136,7 +136,7 @@ definitions = '''
return static_cast<Middle1&>(*c); return static_cast<Middle1&>(*c);
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Child", "typeName":"ns_inheritance_polymorphic_diamond::Child",
"staticSize":88, "staticSize":88,
"dynamicSize":20, "dynamicSize":20,
"members":[ "members":[
@ -162,7 +162,7 @@ definitions = '''
return static_cast<Middle2&>(*c); return static_cast<Middle2&>(*c);
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Child", "typeName":"ns_inheritance_polymorphic_diamond::Child",
"staticSize":88, "staticSize":88,
"dynamicSize":20, "dynamicSize":20,
"members":[ "members":[
@ -186,7 +186,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Child", "typeName":"ns_inheritance_polymorphic_diamond::Child",
"staticSize":88, "staticSize":88,
"dynamicSize":20, "dynamicSize":20,
"members":[ "members":[
@ -210,7 +210,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Child", "typeName":"ns_inheritance_polymorphic_diamond::Child",
"staticSize":88, "staticSize":88,
"dynamicSize":20, "dynamicSize":20,
"members":[ "members":[
@ -234,7 +234,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"Child", "typeName":"ns_inheritance_polymorphic_diamond::Child",
"staticSize":88, "staticSize":88,
"dynamicSize":20, "dynamicSize":20,
"members":[ "members":[

20
test/integration/inheritance_polymorphic_non_dynamic_base.toml
View File

@ -27,7 +27,7 @@ definitions = '''
arg_types = ["A"] arg_types = ["A"]
setup = "return {};" setup = "return {};"
expect_json = '''[{ expect_json = '''[{
"typeName":"A", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::A",
"staticSize":4, "staticSize":4,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
@ -38,7 +38,7 @@ definitions = '''
arg_types = ["A"] arg_types = ["A"]
setup = 'return {};' setup = 'return {};'
expect_json = '''[{ expect_json = '''[{
"typeName":"A", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::A",
"staticSize":4, "staticSize":4,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
@ -63,7 +63,7 @@ definitions = '''
return b; return b;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"A", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::A",
"staticSize":4, "staticSize":4,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
@ -80,7 +80,7 @@ definitions = '''
return b; return b;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"B", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::B",
"staticSize":40, "staticSize":40,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -98,7 +98,7 @@ definitions = '''
return b; return b;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"B", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::B",
"staticSize":40, "staticSize":40,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -118,7 +118,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"A", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::A",
"staticSize":4, "staticSize":4,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
@ -135,7 +135,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"C", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::C",
"staticSize":48, "staticSize":48,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -155,7 +155,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"C", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::C",
"staticSize":48, "staticSize":48,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -174,7 +174,7 @@ definitions = '''
return c; return c;
''' '''
expect_json = '''[{ expect_json = '''[{
"typeName":"C", "typeName":"ns_inheritance_polymorphic_non_dynamic_base::C",
"staticSize":48, "staticSize":48,
"dynamicSize":12, "dynamicSize":12,
"members":[ "members":[
@ -184,7 +184,7 @@ definitions = '''
{"name":"int_c", "staticSize":4, "dynamicSize":0} {"name":"int_c", "staticSize":4, "dynamicSize":0}
]}]''' ]}]'''
expect_json_v2 = '''[{ expect_json_v2 = '''[{
"typeNames": ["C"], "typeNames": ["ns_inheritance_polymorphic_non_dynamic_base::C"],
"staticSize": 48, "staticSize": 48,
"exclusiveSize": 8, "exclusiveSize": 8,
"members": [ "members": [

12
test/integration/thrift_unions.toml
View File

@ -31,7 +31,7 @@ namespace cpp2 {
"staticSize":8, "staticSize":8,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
{"typeName":"storage_type", "name":"value_", "staticSize":4}, {"typeName":"cpp2::StaticUnion::storage_type", "name":"value_", "staticSize":4},
{"typeName":"underlying_type_t<cpp2::StaticUnion::Type>", "name":"type_", "staticSize":4} {"typeName":"underlying_type_t<cpp2::StaticUnion::Type>", "name":"type_", "staticSize":4}
]}]''' ]}]'''
expect_json_v2 = '''[{ expect_json_v2 = '''[{
@ -39,7 +39,7 @@ namespace cpp2 {
"exclusiveSize":0, "exclusiveSize":0,
"size":8, "size":8,
"members":[ "members":[
{"typeNames":["storage_type"], "name":"value_", "staticSize":4, "exclusiveSize":4, "size":4}, {"typeNames":["cpp2::StaticUnion::storage_type"], "name":"value_", "staticSize":4, "exclusiveSize":4, "size":4},
{"typeNames":["underlying_type_t<cpp2::StaticUnion::Type>", "type", "int32_t"], "name":"type_", "staticSize":4, "exclusiveSize":4, "size":4} {"typeNames":["underlying_type_t<cpp2::StaticUnion::Type>", "type", "int32_t"], "name":"type_", "staticSize":4, "exclusiveSize":4, "size":4}
]}]''' ]}]'''
[cases.dynamic_int] [cases.dynamic_int]
@ -53,7 +53,7 @@ namespace cpp2 {
"staticSize":32, "staticSize":32,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
{"typeName":"storage_type", "name":"value_", "staticSize":24}, {"typeName":"cpp2::DynamicUnion::storage_type", "name":"value_", "staticSize":24},
{"typeName":"underlying_type_t<cpp2::DynamicUnion::Type>", "name":"type_", "staticSize":4} {"typeName":"underlying_type_t<cpp2::DynamicUnion::Type>", "name":"type_", "staticSize":4}
]}]''' ]}]'''
expect_json_v2 = '''[{ expect_json_v2 = '''[{
@ -61,7 +61,7 @@ namespace cpp2 {
"exclusiveSize":4, "exclusiveSize":4,
"size":32, "size":32,
"members":[ "members":[
{"typeNames":["storage_type"], "name":"value_", "staticSize":24, "exclusiveSize":24, "size":24}, {"typeNames":["cpp2::DynamicUnion::storage_type"], "name":"value_", "staticSize":24, "exclusiveSize":24, "size":24},
{"typeNames":["underlying_type_t<cpp2::DynamicUnion::Type>", "type", "int32_t"], "name":"type_", "staticSize":4, "exclusiveSize":4, "size":4} {"typeNames":["underlying_type_t<cpp2::DynamicUnion::Type>", "type", "int32_t"], "name":"type_", "staticSize":4, "exclusiveSize":4, "size":4}
]}]''' ]}]'''
[cases.dynamic_vec] [cases.dynamic_vec]
@ -75,7 +75,7 @@ namespace cpp2 {
"staticSize":32, "staticSize":32,
"dynamicSize":0, "dynamicSize":0,
"members":[ "members":[
{"typeName":"storage_type", "name":"value_", "staticSize":24}, {"typeName":"cpp2::DynamicUnion::storage_type", "name":"value_", "staticSize":24},
{"typeName":"underlying_type_t<cpp2::DynamicUnion::Type>", "name":"type_", "staticSize":4} {"typeName":"underlying_type_t<cpp2::DynamicUnion::Type>", "name":"type_", "staticSize":4}
]}]''' ]}]'''
expect_json_v2 = '''[{ expect_json_v2 = '''[{
@ -83,6 +83,6 @@ namespace cpp2 {
"exclusiveSize":4, "exclusiveSize":4,
"size":32, "size":32,
"members":[ "members":[
{"typeNames":["storage_type"], "name":"value_", "staticSize":24, "exclusiveSize":24, "size":24}, {"typeNames":["cpp2::DynamicUnion::storage_type"], "name":"value_", "staticSize":24, "exclusiveSize":24, "size":24},
{"typeNames":["underlying_type_t<cpp2::DynamicUnion::Type>", "type", "int32_t"], "name":"type_", "staticSize":4, "exclusiveSize":4, "size":4} {"typeNames":["underlying_type_t<cpp2::DynamicUnion::Type>", "type", "int32_t"], "name":"type_", "staticSize":4, "exclusiveSize":4, "size":4}
]}]''' ]}]'''