diff --git a/test/main_test.py b/test/main_test.py index 23f87b6cd9739ee4d5a9a40b0bac894e6db245eb..492250448c9649446c9c6a82466964373e02995a 100644 --- a/test/main_test.py +++ b/test/main_test.py @@ -1,19 +1,15 @@ -import libdapConnector +from libdapConnector import * import os import sys -def output_info(string): - libdapConnector.logIt(libdapConnector.LogLevel.L_INFO, string) -def output_info_failed(string): - libdapConnector.logIt(libdapConnector.LogLevel.L_CRITICAL, string) def create_config_file(app_name): f = open(app_name+".cfg", "w") f.write("[server]\nlisten_address=0.0.0.0\n") f.close() -output_info("Start main test") +logIt(LogLevel.L_INFO,"Start main test") app_name = "TestAPP" -output_info("Create config file") +logIt(LogLevel.L_INFO, "Create config file") create_config_file(app_name) @@ -21,26 +17,26 @@ json_string = """{ "modules": "libdap", "dap": { "config_dir": \""""+os.getcwd()+"""\", - "log_level": \""""+libdapConnector.LogLevel.L_DEBUG.name+"""\", + "log_level": \""""+LogLevel.L_DEBUG.name+"""\", "application_name": \""""+app_name+"""\" } }""" -libdapConnector.init(json_string) -output_info("Initialization of the DAP done") -libdapConnector.setLogLevel(libdapConnector.LogLevel.L_DEBUG) -output_info("Level logging ""DEBUG"" done") -libdapConnector.logIt(libdapConnector.LogLevel.L_DEBUG, "Test. Outputting a string using the log_it function in the libdap library") -output_info("Outputting a string using the log_it function done") -res1 = libdapConnector.configGetItem("server", "listen_address") -output_info("Output [server] 'listen_address' = "+res1+"\n") -res2 = libdapConnector.configGetItemDefault("server1", "listen_address", "8.8.8.8") -output_info("Output default value '8.8.8.8' [server1] 'listen_address' = "+res2+"\n") -output_info("TEST. Get default config done") -libdapConnector.deInit() -output_info("Deinitialization done") +init(json_string) +logIt(LogLevel.L_INFO, "Initialization of the DAP done") +setLogLevel(LogLevel.L_DEBUG) +logIt(LogLevel.L_INFO,"Level logging ""DEBUG"" done") +logIt(LogLevel.L_DEBUG, "Test. Outputting a string using the log_it function in the libdap library") +logIt(LogLevel.L_INFO,"Outputting a string using the log_it function done") +res1 = configGetItem("server", "listen_address") +logIt(LogLevel.L_INFO, "Output [server] 'listen_address' = "+res1+"\n") +res2 = configGetItemDefault("server1", "listen_address", "8.8.8.8") +logIt(LogLevel.L_INFO, "Output default value '8.8.8.8' [server1] 'listen_address' = "+res2+"\n") +logIt(LogLevel.L_INFO, "TEST. Get default config done") +deInit() +logIt(LogLevel.L_INFO, "Deinitialization done") os.remove(app_name+".cfg") -output_info("Dellete config file") -output_info("Main test done"); +logIt(LogLevel.L_INFO, "Dellete config file") +logIt(LogLevel.L_INFO, "Main test done"); sys.exit(0)