comparison UnitTestsSources/FromDcmtkTests.cpp @ 3420:0a0e7eca95ae

fix encoding in DICOMweb
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 12 Jun 2019 12:11:58 +0200
parents 63f59ad9381a
children 109631ed3564
comparison
equal deleted inserted replaced
3419:af271172cc36 3420:0a0e7eca95ae
1580 1580
1581 pugi::xml_document doc; 1581 pugi::xml_document doc;
1582 doc.load_buffer(xml.c_str(), xml.size()); 1582 doc.load_buffer(xml.c_str(), xml.size());
1583 1583
1584 pugi::xpath_node node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]/Value"); 1584 pugi::xpath_node node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]/Value");
1585 ASSERT_STREQ("ISO_IR 192", node.node().text().as_string()); 1585 ASSERT_STREQ("ISO 2022 IR 149", node.node().text().as_string());
1586 1586
1587 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]"); 1587 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]");
1588 ASSERT_STREQ("CS", node.node().attribute("vr").value()); 1588 ASSERT_STREQ("CS", node.node().attribute("vr").value());
1589 1589
1590 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]"); 1590 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]");
1660 1660
1661 pugi::xml_document doc; 1661 pugi::xml_document doc;
1662 doc.load_buffer(xml.c_str(), xml.size()); 1662 doc.load_buffer(xml.c_str(), xml.size());
1663 1663
1664 pugi::xpath_node node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]/Value"); 1664 pugi::xpath_node node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]/Value");
1665 ASSERT_STREQ("ISO_IR 192", node.node().text().as_string()); 1665 ASSERT_STREQ("ISO 2022 IR 87", node.node().text().as_string());
1666 1666
1667 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]"); 1667 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00080005\"]");
1668 ASSERT_STREQ("CS", node.node().attribute("vr").value()); 1668 ASSERT_STREQ("CS", node.node().attribute("vr").value());
1669 1669
1670 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]"); 1670 node = SelectNode(doc, "//NativeDicomModel/DicomAttribute[@tag=\"00100010\"]");