Skip to content

Fixes for SDMX 2.1 Structure Tests #11

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

Open
buhaiovos wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for SDMX 2.1 Structure Tests #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a50dbff
Fixes
Feb 20, 2024
48be4ff
Merge pull request #1 from buhaiovos/fixes
buhaiovos Feb 20, 2024
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
4 changes: 2 additions & 2 deletions sdmx-tck-manager/src/checker/HttpResponseValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class HttpResponseValidator {
} catch (err) {
let tckStatus = FAILURE_CODE;
let code = httpResponse != null ? httpResponse.status : void 0;
if (code === 404 || code === 501) {
if (code === 404 || code === 501 || code === 406) {
tckStatus = SUCCESS_CODE;
}
resolve({ status: tckStatus, url: httpResponse.url, httpStatus: httpResponse.status, error: err.toString() });
Expand Down Expand Up @@ -72,7 +72,7 @@ class HttpResponseValidator {
if (!isDefined(response) && !response.status) {
throw new TckError('No response status')
}
if (response.status !== "406") {
if (response.status !== 406) {
throw new TckError("Response status was not 406 but " + response.status + " instead");
}
}
Expand Down
8 changes: 4 additions & 4 deletions sdmx-tck-manager/src/manager/StructureTestExecutionManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ class StructureTestExecutionManager {
console.log("Test: " + toRun.testId + " SDMX workspace created.");

// If the Rest Resource is "structure" then we have to call the getRandomSdmxObject() function.
var randomStructure = workspace.getRandomSdmxObjectOfType(SDMX_STRUCTURE_TYPE.fromRestResource(toRun.resource));
if (toRun.resource === "structure") {
randomStructure = workspace.getRandomSdmxObject();
}
let randomStructure = (toRun.resource === "structure")
? workspace.getRandomSdmxObject()
: workspace.getRandomSdmxObjectOfType(SDMX_STRUCTURE_TYPE.fromRestResource(toRun.resource));

testResult.randomStructure = {
structureType: randomStructure.getStructureType(),
agencyId: randomStructure.getAgencyId(),
Expand Down
5 changes: 3 additions & 2 deletions sdmx-tck-parsers/src/parsers/structure-queries-parsers/SdmxV21StructuresParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,10 @@ class SdmxV21StructuresParser {
structures.set(structureType, []);
}
structures.get(structureType).push(
new MaintainableObject(structureType, hierarchicalCodelist,
new ItemSchemeObject(structureType, hierarchicalCodelist,
SdmxV21StructureReferencesParser.getReferences(hierarchicalCodelist),
SdmxV21JsonForStubsParser.getDetail(structureType, hierarchicalCodelist)
SdmxV21JsonForStubsParser.getDetail(structureType, hierarchicalCodelist),
SdmxV21JsonItemsParser.getItems(structureType, hierarchicalCodelist)
)
);
}
Expand Down