Merge pull request #1260 from RusJaI/4.3.x

Modify integration tests regarding to the improvement that allowing an API and  a Common policy to have  same name and version

Author: npamudika

…eCaseArtifacts/customAddLogMessage_v1.j2 …eArtifacts/customAddLogMessage_v1_api.j2import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1.j2 renamed to import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1_api.j2 import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1.j2 renamed to import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1_api.j2

@@ -386,14 +386,15 @@ func ValidateAPIWithUpdatedSequenceIsExported(t *testing.T, args *InitTestArgs,
 	base.Unzip(relativePath, exportedPath)
 
 	// Check whether the exported operation policy is equivalent to the latest operation policy
-	exportedApiSequencePath := relativePath + TestDefaultExtractedFileName + DevFirstSampleCaseDestPolicy1PathSuffix
+	exportedApiSequencePath := relativePath + TestDefaultExtractedFileName + DevFirstSampleCaseDestExportedPolicy1PathSuffix
+
 	lastUpdatedSequencePath, _ := filepath.Abs(DevFirstUpdatedSampleCasePolicy1Path)
 	isSequenceUpdated := base.IsFileContentIdentical(exportedApiSequencePath, lastUpdatedSequencePath)
 	base.Log("Exported operation policy is updated", isSequenceUpdated)
 	assert.Equal(t, true, isSequenceUpdated, "Error while updating the operation policy of API")
 
 	// Check whether the exported operation policy definition is equivalent to the latest operation policy definition
-	exportedApiSequenceDefinitionPath := relativePath + TestDefaultExtractedFileName + DevFirstSampleCaseDestPolicyDefinition1PathSuffix
+	exportedApiSequenceDefinitionPath := relativePath + TestDefaultExtractedFileName + DevFirstSampleCaseDestExportedPolicyDefinition1PathSuffix
 	lastUpdatedSequenceDefinitionPath, _ := filepath.Abs(DevFirstUpdatedSampleCasePolicyDefinition1Path)
 	isSequenceDefinitionUpdated := base.IsFileContentIdentical(exportedApiSequenceDefinitionPath, lastUpdatedSequenceDefinitionPath)
 	base.Log("Exported operation policy definition is updated", isSequenceDefinitionUpdated)

…aseArtifacts/customAddLogMessage_v1.yaml …rtifacts/customAddLogMessage_v1_api.yamlimport-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1.yaml renamed to import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1_api.yaml import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1.yaml renamed to import-export-cli/integration/testdata/TestArtifactDirectory/DevFirstUpdatedSampleCaseArtifacts/customAddLogMessage_v1_api.yaml

@@ -108,6 +108,7 @@ func AddSequenceWithDynamicDataToAPIProject(t *testing.T, args *InitTestArgs) ap
 	operationPolicies := apim.OperationPolicies{
 		Request: append(requestPolicies, map[string]interface{}{
 			"policyName": TestSampleDynamicDataPolicyName,
+			"policyType": "api",
 		}),
 		Response: []string{},
 		Fault:    []string{},

…CaseArtifacts/dynamicAddLogMessage_v1.j2 …Artifacts/dynamicAddLogMessage_v1_api.j2import-export-cli/integration/testdata/TestArtifactDirectory/DynamicDataSampleCaseArtifacts/dynamicAddLogMessage_v1.j2 renamed to import-export-cli/integration/testdata/TestArtifactDirectory/DynamicDataSampleCaseArtifacts/dynamicAddLogMessage_v1_api.j2 import-export-cli/integration/testdata/TestArtifactDirectory/DynamicDataSampleCaseArtifacts/dynamicAddLogMessage_v1.j2 renamed to import-export-cli/integration/testdata/TestArtifactDirectory/DynamicDataSampleCaseArtifacts/dynamicAddLogMessage_v1_api.j2

@@ -190,10 +190,12 @@ const DevSampleCaseMalformedOperationPolicyDefinitionPath = DevFirstSampleCaseMa
 const DevSampleCaseMalformedOperationPolicyPath = DevFirstSampleCaseMalformedOperationPolicyArtifactPath + "/customAddLogMessage.j2"
 const DevFirstSampleCaseDestPolicy1PathSuffix = PoliciesDirectory + "/customAddLogMessage_v1.j2"
 const DevFirstSampleCaseDestPolicy2PathSuffix = PoliciesDirectory + "/customAddLogMessage_v2.j2"
+const DevFirstSampleCaseDestExportedPolicy1PathSuffix = PoliciesDirectory + "/customAddLogMessage_v1_api.j2"
 const DevFirstSampleCaseDestPolicyDefinition1PathSuffix = PoliciesDirectory + "/customAddLogMessage_v1.yaml"
 const DevFirstSampleCaseDestPolicyDefinition2PathSuffix = PoliciesDirectory + "/customAddLogMessage_v2.yaml"
-const DevFirstUpdatedSampleCasePolicy1Path = DevFirstUpdatedSampleCaseArtifactPath + "/customAddLogMessage_v1.j2"
-const DevFirstUpdatedSampleCasePolicyDefinition1Path = DevFirstUpdatedSampleCaseArtifactPath + "/customAddLogMessage_v1.yaml"
+const DevFirstSampleCaseDestExportedPolicyDefinition1PathSuffix = PoliciesDirectory + "/customAddLogMessage_v1_api.yaml"
+const DevFirstUpdatedSampleCasePolicy1Path = DevFirstUpdatedSampleCaseArtifactPath + "/customAddLogMessage_v1_api.j2"
+const DevFirstUpdatedSampleCasePolicyDefinition1Path = DevFirstUpdatedSampleCaseArtifactPath + "/customAddLogMessage_v1_api.yaml"
 const TestSynapseChoreoConnectPolicyDefinitionPath = TestSynapseChoreoConnectPolicyArtifactsPath + "/testSynapseChoreoConnectPolicy.yaml"
 const TestSynapseChoreoConnectPolicyPathForSynapseType = TestSynapseChoreoConnectPolicyArtifactsPath + "/testSynapseChoreoConnectPolicy.j2"
 const TestSynapseChoreoConnectPolicyPathForChoreoConnectType = TestSynapseChoreoConnectPolicyArtifactsPath + "/testSynapseChoreoConnectPolicy.gotmpl"
@@ -214,9 +216,9 @@ const (
 
 // Constants for sequence of the dynamic data test case
 const DynamicDataSampleCaseArtifactPath = "testdata/TestArtifactDirectory/DynamicDataSampleCaseArtifacts"
-const DynamicDataInSequence = "dynamicAddLogMessage_v1.j2"
-const DynamicDataInSequenceDefinition = "dynamicAddLogMessage_v1.yaml"
-const DynamicDataSubstitutedInSequence = DynamicDataSampleCaseArtifactPath + "/dynamicDataSubstitutedAddLogMessage_v1.j2"
+const DynamicDataInSequence = "dynamicAddLogMessage_v1_api.j2"
+const DynamicDataInSequenceDefinition = "dynamicAddLogMessage_v1_api.yaml"
+const DynamicDataSubstitutedInSequence = DynamicDataSampleCaseArtifactPath + "/dynamicDataSubstitutedAddLogMessage_v1_api.j2"
 
 const (
 	TestSampleDynamicDataOperationTarget           = "/menu"