@@ -17,7 +17,8 @@ public class WorkerConsoleLogServiceTests
17
17
{
18
18
private IScriptEventManager _eventManager ;
19
19
private IProcessRegistry _processRegistry ;
20
- private TestLogger _testLogger = new TestLogger ( "test" ) ;
20
+ private TestLogger _testUserLogger = new TestLogger ( "Host.Function.Console" ) ;
21
+ private TestLogger _testSystemLogger = new TestLogger ( "Worker.rpcWorkerProcess" ) ;
21
22
private WorkerConsoleLogService _workerConsoleLogService ;
22
23
private WorkerConsoleLogSource _workerConsoleLogSource ;
23
24
private Mock < IServiceProvider > _serviceProviderMock ;
@@ -30,31 +31,36 @@ public async Task WorkerConsoleLogService_ConsoleLogs_LogLevel_Expected(bool use
30
31
_workerConsoleLogSource = new WorkerConsoleLogSource ( ) ;
31
32
_eventManager = new ScriptEventManager ( ) ;
32
33
_processRegistry = new EmptyProcessRegistry ( ) ;
33
- _workerConsoleLogService = new WorkerConsoleLogService ( _testLogger , _workerConsoleLogSource ) ;
34
+ _workerConsoleLogService = new WorkerConsoleLogService ( _testUserLogger , _workerConsoleLogSource ) ;
34
35
_serviceProviderMock = new Mock < IServiceProvider > ( MockBehavior . Strict ) ;
35
- WorkerProcess workerProcess = new TestWorkerProcess ( _eventManager , _processRegistry , _testLogger , _workerConsoleLogSource , null , _serviceProviderMock . Object , useStdErrForErroLogsOnly ) ;
36
+ WorkerProcess workerProcess = new TestWorkerProcess ( _eventManager , _processRegistry , _testSystemLogger , _workerConsoleLogSource , null , _serviceProviderMock . Object , useStdErrForErroLogsOnly ) ;
36
37
workerProcess . ParseErrorMessageAndLog ( "Test Message No keyword" ) ;
37
38
workerProcess . ParseErrorMessageAndLog ( "Test Error Message" ) ;
38
39
workerProcess . ParseErrorMessageAndLog ( "Test Warning Message" ) ;
39
-
40
- workerProcess . BuildAndLogConsoleLog ( "LanguageWorkerConsoleLog[Test worker log]" , LogLevel . Information ) ;
40
+ workerProcess . ParseErrorMessageAndLog ( "LanguageWorkerConsoleLog[Test Worker Message No keyword]" ) ;
41
+ workerProcess . ParseErrorMessageAndLog ( "LanguageWorkerConsoleLog[Test Worker Error Message]" ) ;
42
+ workerProcess . ParseErrorMessageAndLog ( "LanguageWorkerConsoleLog[Test Worker Warning Message]" ) ;
41
43
42
44
_ = _workerConsoleLogService . ProcessLogs ( ) . ContinueWith ( t => { } ) ;
43
45
await _workerConsoleLogService . StopAsync ( System . Threading . CancellationToken . None ) ;
44
- var allLogs = _testLogger . GetLogMessages ( ) ;
45
- Assert . True ( allLogs . Count == 4 ) ;
46
- VerifyLogLevel ( allLogs , "Test Error Message" , LogLevel . Error ) ;
47
- VerifyLogLevel ( allLogs , "Test Warning Message" , LogLevel . Warning ) ;
46
+ var userLogs = _testUserLogger . GetLogMessages ( ) ;
47
+ var systemLogs = _testSystemLogger . GetLogMessages ( ) ;
48
+ Assert . True ( userLogs . Count == 3 ) ;
49
+ Assert . True ( systemLogs . Count == 3 ) ;
50
+ VerifyLogLevel ( userLogs , "Test Error Message" , LogLevel . Error ) ;
51
+ VerifyLogLevel ( systemLogs , "[Test Worker Error Message]" , LogLevel . Error ) ;
52
+ VerifyLogLevel ( userLogs , "Test Warning Message" , LogLevel . Warning ) ;
53
+ VerifyLogLevel ( systemLogs , "[Test Worker Warning Message]" , LogLevel . Warning ) ;
48
54
if ( useStdErrForErroLogsOnly )
49
55
{
50
- VerifyLogLevel ( allLogs , "Test Message No keyword" , LogLevel . Error ) ;
56
+ VerifyLogLevel ( userLogs , "Test Message No keyword" , LogLevel . Error ) ;
57
+ VerifyLogLevel ( systemLogs , "[Test Worker Message No keyword]" , LogLevel . Error ) ;
51
58
}
52
59
else
53
60
{
54
- VerifyLogLevel ( allLogs , "Test Message No keyword" , LogLevel . Information ) ;
61
+ VerifyLogLevel ( userLogs , "Test Message No keyword" , LogLevel . Information ) ;
62
+ VerifyLogLevel ( systemLogs , "[Test Worker Message No keyword]" , LogLevel . Information ) ;
55
63
}
56
-
57
- VerifyLogLevel ( allLogs , "[Test worker log]" , LogLevel . Debug ) ;
58
64
}
59
65
60
66
private static void VerifyLogLevel ( IList < LogMessage > allLogs , string msg , LogLevel expectedLevel )
0 commit comments