Fixing unit tests

Author: shreyas-gopalakrishna

src/WebJobs.Script/Workers/Profiles/WorkerDescriptionProfile.cs

@@ -90,7 +90,7 @@ private string UseProfileOrDefault(string profileParameter, string defaultParame
 
         private IList<string> UseProfileOrDefault(IList<string> profileParameter, IList<string> defaultParameter)
         {
-            return profileParameter.Count > 0 ? profileParameter : defaultParameter;
+            return profileParameter != null && profileParameter.Count > 0 ? profileParameter : defaultParameter;
         }
     }
 }

src/WebJobs.Script/Workers/Profiles/WorkerProfileConditionDescriptor.cs

@@ -17,7 +17,7 @@ public sealed class WorkerProfileConditionDescriptor
 
         private IDictionary<string, string> _properties;
 
-        [JsonProperty(Required = Required.Always)]
+        [JsonProperty(Required = Required.Always, PropertyName = WorkerConstants.WorkerDescriptionProfileConditionType)]
         public string Type { get; set; }
 
         public IDictionary<string, string> Properties

src/WebJobs.Script/Workers/Profiles/WorkerProfileDescriptor.cs

@@ -8,7 +8,7 @@ namespace Microsoft.Azure.WebJobs.Script.Workers.Profiles
 {
     public sealed class WorkerProfileDescriptor
     {
-        public string Name { get; set; }
+        public string ProfileName { get; set; }
 
         public RpcWorkerDescription Description { get; set; }
 

src/WebJobs.Script/Workers/Rpc/Configuration/RpcWorkerConfigFactory.cs

@@ -201,14 +201,14 @@ private List<WorkerDescriptionProfile> ReadWorkerDescriptionProfiles(JToken prof
                         if (!_profileManager.TryCreateWorkerProfileCondition(descriptor, out IWorkerProfileCondition condition))
                         {
                             // Failed to resolve condition. This profile will be disabled using a mock false condition
-                            _logger?.LogInformation($"Profile {profile.Name} is disabled. Cannot resolve the profile condition {descriptor.Type}");
+                            _logger?.LogInformation($"Profile {profile.ProfileName} is disabled. Cannot resolve the profile condition {descriptor.Type}");
                             condition = new FalseCondition();
                         }
 
                         profileConditions.Add(condition);
                     }
 
-                    descriptionProfiles.Add(new (profile.Name, profileConditions, profile.Description));
+                    descriptionProfiles.Add(new (profile.ProfileName, profileConditions, profile.Description));
                 }
             }
             catch (Exception)

test/WebJobs.Script.Tests/Workers/Profiles/HostPropertyConditionTests.cs

@@ -55,7 +55,7 @@ public void HostPropertyConditionTest_EvaluateTrue(string name, string testExpre
         [Theory]
         //[InlineData("sku", "Dynamic")] TODO: Add test case
         [InlineData("platForm", "Windows")]
-        [InlineData("HostVersion", "3.*")]
+        [InlineData("HostVersion", "-1")]
         public void HostPropertyConditionTest_EvaluateFalse(string name, string testExpression)
         {
             var testLogger = new TestLogger("test");

test/WebJobs.Script.Tests/Workers/Profiles/ProfilesTestUtilities.cs

@@ -12,7 +12,7 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles
 {
     public class ProfilesTestUtilities
     {
-        public static JObject GetTestWorkerProfileCondition(string type = "hostproperty", string name = "hostversion", string expression = "4.*")
+        public static JObject GetTestWorkerProfileCondition(string type = WorkerConstants.WorkerDescriptionProfileHostPropertyCondition, string name = "hostVersion", string expression = "4.*")
         {
             var condition = new JObject();
             condition[WorkerConstants.WorkerDescriptionProfileConditionType] = type;

test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigTestUtilities.cs

@@ -18,7 +18,7 @@ public class RpcWorkerConfigTestUtilities
         public const string HttpWorkerExe = "httpServer.exe";
         public const string TestDefaultExecutablePath = "testWorkerPath";
 
-        public static JObject GetTestWorkerConfig(string language, string[] arguments, bool invalid, string profileName, bool emptyWorkerPath = false)
+        public static JObject GetTestWorkerConfig(string language, string[] arguments, bool invalid, string profileName, bool invalidProfile, bool emptyWorkerPath = false)
         {
             WorkerDescription description = GetTestDefaultWorkerDescription(language, arguments);
 
@@ -32,10 +32,16 @@ public static JObject GetTestWorkerConfig(string language, string[] arguments, b
                     DefaultExecutablePath = "myFooPath",
                 };
 
-                JArray profiles = new JArray();
-                JObject profile = new JObject();
+                var profiles = new JArray();
+                var profile = new JObject();
+                var conditions = new JArray();
                 profile[WorkerConstants.WorkerDescriptionProfileName] = "profileName";
-                profile[WorkerConstants.WorkerDescriptionProfileConditions] = ProfilesTestUtilities.GetTestWorkerProfileCondition();
+                if (invalidProfile)
+                {
+                    conditions.Add(ProfilesTestUtilities.GetTestWorkerProfileCondition(WorkerConstants.WorkerDescriptionProfileHostPropertyCondition, "hostVersion", "-1"));
+                }
+                conditions.Add(ProfilesTestUtilities.GetTestWorkerProfileCondition());
+                profile[WorkerConstants.WorkerDescriptionProfileConditions] = conditions;
                 profile[WorkerConstants.WorkerDescription] = JObject.FromObject(appSvcDescription);
                 profiles.Add(profile);
                 config[WorkerConstants.WorkerDescriptionProfiles] = profiles;

test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigTests.cs

@@ -115,7 +115,7 @@ public void ReadWorkerProviderFromConfig_ArgumentsFromSettings()
         [Fact]
         public void ReadWorkerProviderFromConfig_EmptyWorkerPath()
         {
-            var configs = new List<TestRpcWorkerConfig>() { MakeTestConfig(testLanguage, new string[0], false, string.Empty, true) };
+            var configs = new List<TestRpcWorkerConfig>() { MakeTestConfig(testLanguage, new string[0], false, string.Empty, false, true) };
             TestMetricsLogger testMetricsLogger = new TestMetricsLogger();
 
             var workerConfigs = TestReadWorkerProviderFromConfig(configs, new TestLogger(testLanguage), testMetricsLogger);
@@ -205,7 +205,7 @@ public void ReadWorkerProviderFromConfig_InvalidWorker()
         public void ReadWorkerProviderFromConfig_AddProfile_ReturnsDefaultDescription()
         {
             var expectedArguments = new string[] { "-v", "verbose" };
-            var configs = new List<TestRpcWorkerConfig>() { MakeTestConfig(testLanguage, expectedArguments, false, "TestProfile") };
+            var configs = new List<TestRpcWorkerConfig>() { MakeTestConfig(testLanguage, expectedArguments, false, "TestProfile", true) };
             var testLogger = new TestLogger(testLanguage);
             TestMetricsLogger testMetricsLogger = new TestMetricsLogger();
 
@@ -672,9 +672,9 @@ private static IConfigurationRoot TestConfigBuilder(string workerPathSection, Di
             return config;
         }
 
-        private static TestRpcWorkerConfig MakeTestConfig(string language, string[] arguments, bool invalid = false, string addAppSvcProfile = "", bool emptyWorkerPath = false)
+        private static TestRpcWorkerConfig MakeTestConfig(string language, string[] arguments, bool invalid = false, string addAppSvcProfile = "", bool invalidProfile = false, bool emptyWorkerPath = false)
         {
-            string json = RpcWorkerConfigTestUtilities.GetTestWorkerConfig(language, arguments, invalid, addAppSvcProfile, emptyWorkerPath).ToString();
+            string json = RpcWorkerConfigTestUtilities.GetTestWorkerConfig(language, arguments, invalid, addAppSvcProfile, invalidProfile, emptyWorkerPath).ToString();
             return new TestRpcWorkerConfig()
             {
                 Json = json,