Skip to content

Commit ef593bd

Browse files
namsonxnamsonx
committed
Update selftest due to temporary disabled implicit creation based on nested params
1 parent f1de100 commit ef593bd

File tree

2 files changed

+26
-25
lines changed

2 files changed

+26
-25
lines changed

‎test/testconfig/TestConfig.py‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,26 +2130,27 @@
21302130
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1000.jsonp"
21312131
dictUsecase['EXPECTEDEXCEPTION'] = None
21322132
dictUsecase['EXPECTEDRETURN'] = """
2133-
[DICT] (4/1) > {dTestDict} [DICT] (6/1) > {kVal_1} [STR] : 'Val_1'
2134-
[DICT] (4/1) > {dTestDict} [DICT] (6/2) > {kVal_2} [DICT] (1/1) > {I_am_not_existing_1} [DICT] (1/1) > {I_am_not_existing_2} [STR] : 'Val_1'
2135-
[DICT] (4/1) > {dTestDict} [DICT] (6/3) > {kVal_3} [DICT] (1/1) > {I_am_not_existing_3} [DICT] (1/1) > {I_am_not_existing_4} [STR] : 'Val_1_extended'
2136-
[DICT] (4/1) > {dTestDict} [DICT] (6/4) > {kVal_3b} [DICT] (1/1) > {I_am_not_existing_3b} [DICT] (1/1) > {I_am_not_existing_4b} [STR] : 'Val_1'
2137-
[DICT] (4/1) > {dTestDict} [DICT] (6/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/1) > {A} [INT] : 1
2138-
[DICT] (4/1) > {dTestDict} [DICT] (6/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/2) > {B} [LIST] (2/1) > [INT] : 1
2139-
[DICT] (4/1) > {dTestDict} [DICT] (6/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/2) > {B} [LIST] (2/2) > [INT] : 2
2140-
[DICT] (4/1) > {dTestDict} [DICT] (6/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/3) > {kVal_4D} [DICT] (1/1) > {kVal_4E} [DICT] (1/1) > {kVal_4F} [DICT] (1/1) > {kVal_4G} [DICT] (2/1) > {C} [INT] : 2
2141-
[DICT] (4/1) > {dTestDict} [DICT] (6/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/3) > {kVal_4D} [DICT] (1/1) > {kVal_4E} [DICT] (1/1) > {kVal_4F} [DICT] (1/1) > {kVal_4G} [DICT] (2/2) > {D} [LIST] (2/1) > [INT] : 3
2142-
[DICT] (4/1) > {dTestDict} [DICT] (6/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/3) > {kVal_4D} [DICT] (1/1) > {kVal_4E} [DICT] (1/1) > {kVal_4F} [DICT] (1/1) > {kVal_4G} [DICT] (2/2) > {D} [LIST] (2/2) > [INT] : 4
2143-
[DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/1) > {E} [INT] : 3
2144-
[DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/2) > {F} [LIST] (2/1) > [INT] : 5
2145-
[DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/2) > {F} [LIST] (2/2) > [INT] : 6
2146-
[DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/3) > {kVal_5C} [DICT] (2/1) > {G} [INT] : 4
2147-
[DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/3) > {kVal_5C} [DICT] (2/2) > {H} [LIST] (2/1) > [INT] : 7
2148-
[DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/3) > {kVal_5C} [DICT] (2/2) > {H} [LIST] (2/2) > [INT] : 8
2149-
[DICT] (4/2) > {kVal_5B_name} [STR] : 'kVal_5B'
2150-
[DICT] (4/3) > {kVal_5C_name} [STR] : 'kVal_5C'
2151-
[DICT] (4/4) > {Val_1_extended} [STR] : 'Val_1'
2133+
[DICT] (2/1) > {dTestDict} [DICT] (5/1) > {kVal_1} [STR] : 'Val_1'
2134+
[DICT] (2/1) > {dTestDict} [DICT] (5/2) > {kVal_2} [DICT] (1/1) > {I_am_not_existing_1} [DICT] (1/1) > {I_am_not_existing_2} [STR] : 'Val_1'
2135+
[DICT] (2/1) > {dTestDict} [DICT] (5/3) > {kVal_3} [DICT] (1/1) > {I_am_not_existing_3} [DICT] (1/1) > {I_am_not_existing_4} [STR] : 'Val_1_extended'
2136+
[DICT] (2/1) > {dTestDict} [DICT] (5/4) > {kVal_3b} [DICT] (1/1) > {I_am_not_existing_3b} [DICT] (1/1) > {I_am_not_existing_4b} [STR] : 'Val_1'
2137+
[DICT] (2/1) > {dTestDict} [DICT] (5/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/1) > {A} [INT] : 1
2138+
[DICT] (2/1) > {dTestDict} [DICT] (5/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/2) > {B} [LIST] (2/1) > [INT] : 1
2139+
[DICT] (2/1) > {dTestDict} [DICT] (5/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/2) > {B} [LIST] (2/2) > [INT] : 2
2140+
[DICT] (2/1) > {dTestDict} [DICT] (5/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/3) > {kVal_4D} [DICT] (1/1) > {kVal_4E} [DICT] (1/1) > {kVal_4F} [DICT] (1/1) > {kVal_4G} [DICT] (2/1) > {C} [INT] : 2
2141+
[DICT] (2/1) > {dTestDict} [DICT] (5/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/3) > {kVal_4D} [DICT] (1/1) > {kVal_4E} [DICT] (1/1) > {kVal_4F} [DICT] (1/1) > {kVal_4G} [DICT] (2/2) > {D} [LIST] (2/1) > [INT] : 3
2142+
[DICT] (2/1) > {dTestDict} [DICT] (5/5) > {kVal_4} [DICT] (1/1) > {kVal_4B} [DICT] (1/1) > {kVal_4C} [DICT] (3/3) > {kVal_4D} [DICT] (1/1) > {kVal_4E} [DICT] (1/1) > {kVal_4F} [DICT] (1/1) > {kVal_4G} [DICT] (2/2) > {D} [LIST] (2/2) > [INT] : 4
2143+
[DICT] (2/2) > {Val_1_extended} [STR] : 'Val_1'
21522144
"""
2145+
# Comment out these test result due to the implicit creation of data structures based on nested parameters is temporary disabled.
2146+
# [DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/1) > {E} [INT] : 3
2147+
# [DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/2) > {F} [LIST] (2/1) > [INT] : 5
2148+
# [DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/2) > {F} [LIST] (2/2) > [INT] : 6
2149+
# [DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/3) > {kVal_5C} [DICT] (2/1) > {G} [INT] : 4
2150+
# [DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/3) > {kVal_5C} [DICT] (2/2) > {H} [LIST] (2/1) > [INT] : 7
2151+
# [DICT] (4/1) > {dTestDict} [DICT] (6/6) > {kVal_5} [DICT] (1/1) > {kVal_5B} [DICT] (3/3) > {kVal_5C} [DICT] (2/2) > {H} [LIST] (2/2) > [INT] : 8
2152+
# [DICT] (4/2) > {kVal_5B_name} [STR] : 'kVal_5B'
2153+
# [DICT] (4/3) > {kVal_5C_name} [STR] : 'kVal_5C'
21532154
listofdictUsecases.append(dictUsecase)
21542155
del dictUsecase
21552156
# --------------------------------------------------------------------------------------------------------------

‎test/testfiles/import/import.1/import.1.1/jpp-test_config_implicit_creation.1.1.1.jsonp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"${dTestDict.kVal_3.I_am_not_existing_3.I_am_not_existing_4}" : "${dTestDict}['kVal_2']['I_am_not_existing_1']['I_am_not_existing_2']",
1919
// mixture of dotdict and standard notation:
2020
${dTestDict.kVal_4}['kVal_4B']['kVal_4C'] : {"A" : 1, "B" : [1,2]},
21-
${dTestDict.kVal_4.kVal_4B.kVal_4C.kVal_4D.kVal_4E}['kVal_4F']['kVal_4G'] : {"C" : 2, "D" : [3,4]},
22-
// sub key defined by parameter:
23-
"kVal_5B_name" : "kVal_5B",
24-
"kVal_5C_name" : "kVal_5C",
25-
${dTestDict.kVal_5.${kVal_5B_name}} : {"E" : 3, "F" : [5,6]},
26-
${dTestDict.kVal_5}['${kVal_5B_name}']['${kVal_5C_name}'] : {"G" : 4, "H" : [7,8]}
21+
${dTestDict.kVal_4.kVal_4B.kVal_4C.kVal_4D.kVal_4E}['kVal_4F']['kVal_4G'] : {"C" : 2, "D" : [3,4]}
22+
// sub key defined by parameter: (Temporary disable implicit creation of data structures based on nested parameters)
23+
// "kVal_5B_name" : "kVal_5B",
24+
// "kVal_5C_name" : "kVal_5C",
25+
// ${dTestDict.kVal_5.${kVal_5B_name}} : {"E" : 3, "F" : [5,6]},
26+
// ${dTestDict.kVal_5}['${kVal_5B_name}']['${kVal_5C_name}'] : {"G" : 4, "H" : [7,8]}
2727
//
2828
// invalid parameter format (reference: https://github.com/test-fullautomation/python-jsonpreprocessor/issues/153)
2929
// ${dTestDict.${kVal_5B_name}.${kVal_5C_name}.kVal_5D} : {"M" : 5, "N" : [0,9]}

0 commit comments

Comments
 (0)