Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dcc-js
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
D-PTB
DCC
Development
dcc-js
Commits
adc461fb
Commit
adc461fb
authored
1 year ago
by
Muhammed-Ali Demir
Browse files
Options
Downloads
Plain Diff
Merge branch 'BugFix_validXMLList' into 'master'
fix(statementmetadatatype): validXMLList See merge request
!11
parents
b8e43d9a
e51bb977
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!11
fix(statementmetadatatype): validXMLList
Pipeline
#23498
passed
1 year ago
Stage: .pre
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/DCC.ts
+1
-1
1 addition, 1 deletion
src/DCC.ts
tests/DCC/GP_Temperatur_v3.2.0_DCC/AdministrativeData.Statements.test.ts
+25
-0
25 additions, 0 deletions
...mperatur_v3.2.0_DCC/AdministrativeData.Statements.test.ts
with
26 additions
and
1 deletion
src/DCC.ts
+
1
−
1
View file @
adc461fb
...
...
@@ -840,7 +840,7 @@ export class StatementMetaDataType extends DCCXMLElement {
// choice
if
(
el
.
valid
)
this
.
valid
=
new
DCCXMLBoolean
(
el
.
valid
);
else
if
(
el
.
validXMLList
)
this
.
validXMLList
=
new
DCCXMLList
(
this
.
validXMLList
);
else
if
(
el
.
validXMLList
)
this
.
validXMLList
=
new
DCCXMLList
(
el
.
validXMLList
);
if
(
el
.
date
)
this
.
date
=
new
DCCXMLDate
(
el
.
date
);
if
(
el
.
period
)
this
.
period
=
new
DCCXMLElement
(
el
.
period
);
...
...
This diff is collapsed.
Click to expand it.
tests/DCC/GP_Temperatur_v3.2.0_DCC/AdministrativeData.Statements.test.ts
+
25
−
0
View file @
adc461fb
...
...
@@ -24,6 +24,18 @@ const xpath = {
},
},
conformity
:
`string(
${
base
}
/dcc:statement[1]/dcc:conformity)`
,
data
:
{
quantity
:
{
measurementMetaData
:
{
metaData1
:
{
declaration
:
{
content
:
`
${
base
}
/dcc:statement[1]/dcc:data/dcc:quantity/dcc:measurementMetaData/dcc:metaData[1]/dcc:declaration/dcc:content`
,
},
validXMLList
:
`string(
${
base
}
/dcc:statement[1]/dcc:data/dcc:quantity/dcc:measurementMetaData/dcc:metaData[1]/dcc:validXMLList)`
,
},
},
},
},
refType
:
`string(
${
base
}
/dcc:statement[1]/@refType)`
,
},
statement2
:
{
...
...
@@ -87,6 +99,19 @@ describe("GP_Temperature_v3.2.0_DCC: StatementMetaDataType", () => {
expect
(
statement1
.
conformity
.
_text
).
toBe
(
select
(
xpath
.
statements
.
statement1
.
conformity
,
dom
));
});
test
(
"
should get correct statement 1 metaData1 declaration content from XML
"
,
()
=>
{
// get expected list from example xml
const
expected
=
<
Element
[]
>
select
(
xpath
.
statements
.
statement1
.
data
.
quantity
.
measurementMetaData
.
metaData1
.
declaration
.
content
,
dom
);
expect
(
toTextArr
(
statement1
.
data
.
quantity
[
0
].
measurementMetaData
.
metaData
[
0
].
declaration
.
content
)).
toEqual
(
toTextContentArr
(
expected
));
});
test
(
"
should get correct statement 1 metaData1 validXMLList from XML
"
,
()
=>
{
// get expected list from example xml
expect
(
statement1
.
data
.
quantity
[
0
].
measurementMetaData
.
metaData
[
0
].
validXMLList
.
_text
).
toBe
(
select
(
xpath
.
statements
.
statement1
.
data
.
quantity
.
measurementMetaData
.
metaData1
.
validXMLList
,
dom
),
);
});
test
(
"
should get correct statement 2 declaration content from XML
"
,
()
=>
{
// get expected list from example xml
const
expected
=
<
Element
[]
>
select
(
xpath
.
statements
.
statement2
.
declaration
.
content
,
dom
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment