@@ -29,14 +29,14 @@ def get_test_info(case):
2929
3030
3131examples_user_input = [
32- ['test/examples/La2C1Cl2' , 'RFC_notDOS' , None , None ,('test/examples/La2C1Cl2/CONTCAR' , 'test/examples/La2C1Cl2/DOSCAR' , 'RFC_notDOS' )],
33- [None , 'SVC+RFR_edges' , ["test/examples/La2C1N2H2/CONTCAR" ,"test/examples/La2C1N2H2/DOSCAR" ], None ,('test/examples/La2C1N2H2/CONTCAR' , 'test/examples/La2C1N2H2/DOSCAR' , 'SVC+RFR_edges' )],
34- ['test/examples/La2C1Te2/' , None , ["test/examples/La2C1Te2/CONTCAR" ,"test/examples/La2C1Te2/DOSCAR" ], None , ('test/examples/La2C1Te2/CONTCAR' , 'test/examples/La2C1Te2/DOSCAR' , 'GBC+RFR_onlygap' )],
35- ['test/examples/La3C2O2H2' , 'best' , None , None , ('test/examples/La3C2O2H2/CONTCAR' , 'test/examples/La3C2O2H2/DOSCAR' , 'GBC+RFR_onlygap' )],
36- ['test/examples/La3C2S2' , 'model_not_exists' , None , AssertionError , ('test/examples/La3C2S2/CONTCAR' , 'test/examples/La3C2S2/DOSCAR' , 'MLPR_edges' )],
37- [None , 'RFR' , ["test/examples/La2C1N2H2/CONTCAR" ,"test/examples/La2C1N2H2/DOSCAR" , "extra" ], ValueError , ('test/examples/La3N2H2/CONTCAR' , 'test/examples/La3N2H2/DOSCAR' , 'RFR' )],
38- [None , 'SVC+SVR' , ["test/examples/La2C1N2H2/CONTCAR" ], ValueError , ('test/examples/La4C3Cl2/CONTCAR' , 'test/examples/La4C3Cl2/DOSCAR' , 'SVR_notDOS' )],
39- [None , None , None , None , ('./CONTCAR' , './DOSCAR' , 'GBC+RFR_onlygap' )]
32+ ['test/examples/La2C1Cl2' , 'RFC_notDOS' , None , None ,('test/examples/La2C1Cl2/CONTCAR' , 'test/examples/La2C1Cl2/DOSCAR' , 'RFC_notDOS' , 'mxgap.info' )],
33+ [None , 'SVC+RFR_edges' , ["test/examples/La2C1N2H2/CONTCAR" ,"test/examples/La2C1N2H2/DOSCAR" ], None ,('test/examples/La2C1N2H2/CONTCAR' , 'test/examples/La2C1N2H2/DOSCAR' , 'SVC+RFR_edges' , 'mxgap.info' )],
34+ ['test/examples/La2C1Te2/' , None , ["test/examples/La2C1Te2/CONTCAR" ,"test/examples/La2C1Te2/DOSCAR" ], None , ('test/examples/La2C1Te2/CONTCAR' , 'test/examples/La2C1Te2/DOSCAR' , 'GBC+RFR_onlygap' , 'mxgap.info' )],
35+ ['test/examples/La3C2O2H2' , 'best' , None , None , ('test/examples/La3C2O2H2/CONTCAR' , 'test/examples/La3C2O2H2/DOSCAR' , 'GBC+RFR_onlygap' , 'mxgap.info' )],
36+ ['test/examples/La3C2S2' , 'model_not_exists' , None , AssertionError , ('test/examples/La3C2S2/CONTCAR' , 'test/examples/La3C2S2/DOSCAR' , 'MLPR_edges' , 'mxgap.info' )],
37+ [None , 'RFR' , ["test/examples/La2C1N2H2/CONTCAR" ,"test/examples/La2C1N2H2/DOSCAR" , "extra" ], ValueError , ('test/examples/La3N2H2/CONTCAR' , 'test/examples/La3N2H2/DOSCAR' , 'RFR' , 'mxgap.info' )],
38+ [None , 'SVC+SVR' , ["test/examples/La2C1N2H2/CONTCAR" ], ValueError , ('test/examples/La4C3Cl2/CONTCAR' , 'test/examples/La4C3Cl2/DOSCAR' , 'SVR_notDOS' , 'mxgap.info' )],
39+ [None , None , None , None , ('./CONTCAR' , './DOSCAR' , 'GBC+RFR_onlygap' , 'mxgap.info' )]
4040]
4141
4242########################################################################
@@ -115,9 +115,9 @@ class TestInput:
115115 def test_validate_user_input (self ,path ,model ,files ,expected_exception ,expected_result ):
116116 if expected_exception is not None :
117117 with pytest .raises (expected_exception ):
118- validate_user_input (path ,model ,files )
118+ validate_user_input (path ,model ,files , output = None )
119119 else :
120- result = validate_user_input (path ,model ,files )
120+ result = validate_user_input (path ,model ,files , output = None )
121121 assert result == expected_result
122122
123123
0 commit comments