@@ -17,16 +17,12 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Rpc
1717{
1818 public class RpcWorkerConfigFactoryTests : IDisposable
1919 {
20- private readonly WorkerProfileManager _profileManager ;
2120 private TestSystemRuntimeInformation _testSysRuntimeInfo = new TestSystemRuntimeInformation ( ) ;
2221 private TestEnvironment _testEnvironment ;
2322
2423 public RpcWorkerConfigFactoryTests ( )
2524 {
2625 _testEnvironment = new TestEnvironment ( ) ;
27-
28- var profileConditionProvider = new WorkerProfileConditionProvider ( new TestLogger < WorkerProfileConditionProvider > ( ) , _testEnvironment ) ;
29- _profileManager = new WorkerProfileManager ( new TestLogger < WorkerProfileManager > ( ) , new [ ] { profileConditionProvider } ) ;
3026 }
3127
3228 public void Dispose ( )
@@ -40,7 +36,7 @@ public void DefaultLanguageWorkersDir()
4036 var expectedWorkersDir = Path . Combine ( Path . GetDirectoryName ( new Uri ( typeof ( RpcWorkerConfigFactory ) . Assembly . CodeBase ) . LocalPath ) , RpcWorkerConstants . DefaultWorkersDirectoryName ) ;
4137 var config = new ConfigurationBuilder ( ) . Build ( ) ;
4238 var testLogger = new TestLogger ( "test" ) ;
43- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
39+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
4440 Assert . Equal ( expectedWorkersDir , configFactory . WorkersDirPath ) ;
4541 }
4642
@@ -73,7 +69,7 @@ public void LanguageWorker_WorkersDir_Set()
7369 } )
7470 . Build ( ) ;
7571 var testLogger = new TestLogger ( "test" ) ;
76- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
72+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
7773 Assert . Equal ( expectedWorkersDir , configFactory . WorkersDirPath ) ;
7874 }
7975
@@ -89,7 +85,7 @@ public void LanguageWorker_WorkersDir_NotSet()
8985 var config = configBuilder . Build ( ) ;
9086 var scriptSettingsManager = new ScriptSettingsManager ( config ) ;
9187 var testLogger = new TestLogger ( "test" ) ;
92- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
88+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
9389 Assert . Equal ( expectedWorkersDir , configFactory . WorkersDirPath ) ;
9490 }
9591
@@ -100,7 +96,7 @@ public void JavaPath_FromEnvVars()
10096 var config = configBuilder . Build ( ) ;
10197 var scriptSettingsManager = new ScriptSettingsManager ( config ) ;
10298 var testLogger = new TestLogger ( "test" ) ;
103- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
99+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
104100 var workerConfigs = configFactory . GetConfigs ( ) ;
105101 var javaPath = workerConfigs . Where ( c => c . Description . Language . Equals ( "java" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) . Description . DefaultExecutablePath ;
106102 Assert . DoesNotContain ( @"%JAVA_HOME%" , javaPath ) ;
@@ -121,7 +117,7 @@ public void DefaultWorkerConfigs_Overrides_DefaultWorkerRuntimeVersion_AppSettin
121117 var testLogger = new TestLogger ( "test" ) ;
122118 using ( var variables = new TestScopedSettings ( scriptSettingsManager , testEnvVariables ) )
123119 {
124- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
120+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
125121 var workerConfigs = configFactory . GetConfigs ( ) ;
126122 var pythonWorkerConfig = workerConfigs . Where ( w => w . Description . Language . Equals ( "python" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) ;
127123 var powershellWorkerConfig = workerConfigs . Where ( w => w . Description . Language . Equals ( "powershell" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) ;
@@ -143,7 +139,7 @@ public void DefaultWorkerConfigs_Overrides_VersionAppSetting()
143139 var config = configBuilder . Build ( ) ;
144140 var scriptSettingsManager = new ScriptSettingsManager ( config ) ;
145141 var testLogger = new TestLogger ( "test" ) ;
146- var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , testEnvironment , new TestMetricsLogger ( ) ) ;
142+ var configFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , testEnvironment , new TestMetricsLogger ( ) ) ;
147143 var workerConfigs = configFactory . GetConfigs ( ) ;
148144 var powershellWorkerConfig = workerConfigs . Where ( w => w . Description . Language . Equals ( "powershell" , StringComparison . OrdinalIgnoreCase ) ) . FirstOrDefault ( ) ;
149145 Assert . Equal ( 1 , workerConfigs . Count ) ;
@@ -170,7 +166,7 @@ public void ShouldAddProvider_Returns_Expected(string workerLanguage, string wor
170166 }
171167 var config = new ConfigurationBuilder ( ) . Build ( ) ;
172168 var testLogger = new TestLogger ( "test" ) ;
173- RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
169+ RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
174170 _testEnvironment . SetEnvironmentVariable ( RpcWorkerConstants . FunctionWorkerRuntimeSettingName , workerRuntime ) ;
175171 Assert . Equal ( expectedResult , rpcWorkerConfigFactory . ShouldAddWorkerConfig ( workerLanguage ) ) ;
176172 }
@@ -200,7 +196,7 @@ public void GetWorkerProcessCount_Tests(bool defaultWorkerConfig, bool setProces
200196 }
201197 var config = new ConfigurationBuilder ( ) . Build ( ) ;
202198 var testLogger = new TestLogger ( "test" ) ;
203- RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
199+ RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
204200 var result = rpcWorkerConfigFactory . GetWorkerProcessCount ( workerConfig ) ;
205201 if ( defaultWorkerConfig )
206202 {
@@ -244,7 +240,7 @@ public void GetWorkerProcessCount_ThrowsException_Tests()
244240
245241 var config = new ConfigurationBuilder ( ) . Build ( ) ;
246242 var testLogger = new TestLogger ( "test" ) ;
247- RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _profileManager , _testEnvironment , new TestMetricsLogger ( ) ) ;
243+ RpcWorkerConfigFactory rpcWorkerConfigFactory = new RpcWorkerConfigFactory ( config , testLogger , _testSysRuntimeInfo , _testEnvironment , new TestMetricsLogger ( ) ) ;
248244 var resultEx1 = Assert . Throws < ArgumentOutOfRangeException > ( ( ) => rpcWorkerConfigFactory . GetWorkerProcessCount ( workerConfig ) ) ;
249245 Assert . Contains ( "ProcessCount must be greater than 0" , resultEx1 . Message ) ;
250246
0 commit comments