Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
npamudika merged 1 commit into from
Feb 24, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...leCaseArtifacts/customAddLogMessage_v1.j2 → ...seArtifacts/customAddLogMessage_v1_api.j2
View file
Open in desktop
File renamed without changes.
0 ...CaseArtifacts/customAddLogMessage_v1.yaml → ...Artifacts/customAddLogMessage_v1_api.yaml
View file
Open in desktop
File renamed without changes.
0 ...eCaseArtifacts/dynamicAddLogMessage_v1.j2 → ...eArtifacts/dynamicAddLogMessage_v1_api.j2
View file
Open in desktop
File renamed without changes.
0 ...aseArtifacts/dynamicAddLogMessage_v1.yaml → ...rtifacts/dynamicAddLogMessage_v1_api.yaml
View file
Open in desktop
File renamed without changes.
0 ...dynamicDataSubstitutedAddLogMessage_v1.j2 → ...micDataSubstitutedAddLogMessage_v1_api.j2
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions import-export-cli/integration/testutils/devFirst_testUtils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions import-export-cli/integration/testutils/dynamicData_testUtils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
Expand Down
12 changes: 7 additions & 5 deletions import-export-cli/integration/testutils/testConstants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down