Fixed some broken unit tests (#502)

* Fix incorrect assertion for serviceUrl.

* Removed obsolete test.

Co-authored-by: Maxime LABELLE <maxime.labelle@chanel.com>

Author: springcomp

src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs

@@ -71,31 +71,6 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.authenticationSettings.subscriptionKeyRequired, apiTemplateResource.properties.authenticationSettings.subscriptionKeyRequired);
         }
 
-        [Fact]
-        public async void ShouldCreateAPITemplateResourceFromCreatorConfigWithoutServiceUrlParameter()
-        {
-            // arrange
-            APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
-            CreatorConfig creatorConfig = new CreatorConfig() { apis = new List<APIConfig>() };
-            APIConfig api = new APIConfig()
-            {
-                name = "name",
-                openApiSpec = "https://petstore.swagger.io/v2/swagger.json",
-                serviceUrl = "https://petstore.swagger.io"
-            };
-            creatorConfig.apis.Add(api);
-
-            // act
-            // the above api config will create a unified api template with a single resource
-            List<Template> apiTemplates = await apiTemplateCreator.CreateAPITemplatesAsync(api);
-            APITemplateResource apiTemplateResource = apiTemplates.FirstOrDefault().resources[0] as APITemplateResource;
-
-            // assert
-            Assert.Single(apiTemplates.First().parameters);
-            Assert.False(apiTemplates.First().parameters.ContainsKey(ParameterNames.ServiceUrl));
-            Assert.Equal("https://petstore.swagger.io", apiTemplateResource.properties.serviceUrl);
-        }
-
         [Fact]
         public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWithCorrectContent()
         {

src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs

@@ -94,7 +94,7 @@ public List<TemplateResource> CreateChildResourceTemplates(APIConfig api)
 
             PolicyTemplateResource apiPolicyResource = api.policy != null ? this.policyTemplateCreator.CreateAPIPolicyTemplateResource(api, dependsOn) : null;
             List<PolicyTemplateResource> operationPolicyResources = api.operations != null ? this.policyTemplateCreator.CreateOperationPolicyTemplateResources(api, dependsOn) : null;
-            List<TagAPITemplateResource> tagAPIResources = api.tags != null ? this.tagAPITemplateCreator.CreateTagAPITemplateResources(api,dependsOn) : null;
+            List<TagAPITemplateResource> tagAPIResources = api.tags != null ? this.tagAPITemplateCreator.CreateTagAPITemplateResources(api, dependsOn) : null;
             DiagnosticTemplateResource diagnosticTemplateResource = api.diagnostic != null ? this.diagnosticTemplateCreator.CreateAPIDiagnosticTemplateResource(api, dependsOn) : null;
             // add release resource if the name has been appended with ;rev{revisionNumber}
             ReleaseTemplateResource releaseTemplateResource = api.name.Contains(";rev") == true ? this.releaseTemplateCreator.CreateAPIReleaseTemplateResource(api, dependsOn) : null;
@@ -126,10 +126,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
             {
                 // add metadata properties for initial and unified templates
                 apiTemplateResource.properties.apiVersion = api.apiVersion;
-                if (!String.IsNullOrEmpty(api.serviceUrl))
-                {
-                    apiTemplateResource.properties.serviceUrl = MakeServiceUrl(api);
-                }
+                apiTemplateResource.properties.serviceUrl = MakeServiceUrl(api);
                 apiTemplateResource.properties.type = api.type;
                 apiTemplateResource.properties.apiType = api.type;
                 apiTemplateResource.properties.description = api.description;