Lines 54-60
Link Here
|
54 |
import org.netbeans.junit.NbTestCase; |
54 |
import org.netbeans.junit.NbTestCase; |
55 |
import org.netbeans.junit.RandomlyFails; |
55 |
import org.netbeans.junit.RandomlyFails; |
56 |
import org.netbeans.modules.project.ant.ProjectLibraryProvider; |
56 |
import org.netbeans.modules.project.ant.ProjectLibraryProvider; |
57 |
import org.netbeans.modules.project.ant.Util; |
|
|
58 |
import org.netbeans.spi.project.AuxiliaryConfiguration; |
57 |
import org.netbeans.spi.project.AuxiliaryConfiguration; |
59 |
import org.netbeans.spi.project.CacheDirectoryProvider; |
58 |
import org.netbeans.spi.project.CacheDirectoryProvider; |
60 |
import org.openide.filesystems.FileObject; |
59 |
import org.openide.filesystems.FileObject; |
Lines 156-167
Link Here
|
156 |
Element data = h.getPrimaryConfigurationData(true); |
155 |
Element data = h.getPrimaryConfigurationData(true); |
157 |
assertEquals("correct element name", "data", data.getLocalName()); |
156 |
assertEquals("correct element name", "data", data.getLocalName()); |
158 |
assertEquals("correct element namespace", "urn:test:shared", data.getNamespaceURI()); |
157 |
assertEquals("correct element namespace", "urn:test:shared", data.getNamespaceURI()); |
159 |
Element stuff = Util.findElement(data, "shared-stuff", "urn:test:shared"); |
158 |
Element stuff = XMLUtil.findElement(data, "shared-stuff", "urn:test:shared"); |
160 |
assertNotNull("had nested stuff in it", stuff); |
159 |
assertNotNull("had nested stuff in it", stuff); |
161 |
data = h.getPrimaryConfigurationData(false); |
160 |
data = h.getPrimaryConfigurationData(false); |
162 |
assertEquals("correct element name", "data", data.getLocalName()); |
161 |
assertEquals("correct element name", "data", data.getLocalName()); |
163 |
assertEquals("correct element namespace", "urn:test:private", data.getNamespaceURI()); |
162 |
assertEquals("correct element namespace", "urn:test:private", data.getNamespaceURI()); |
164 |
stuff = Util.findElement(data, "private-stuff", "urn:test:private"); |
163 |
stuff = XMLUtil.findElement(data, "private-stuff", "urn:test:private"); |
165 |
assertNotNull("had nested stuff in it", stuff); |
164 |
assertNotNull("had nested stuff in it", stuff); |
166 |
} |
165 |
} |
167 |
|
166 |
|
Lines 181-187
Link Here
|
181 |
} |
180 |
} |
182 |
assertEquals("correct element name", "data", data.getLocalName()); |
181 |
assertEquals("correct element name", "data", data.getLocalName()); |
183 |
assertEquals("correct element namespace", "urn:test:shared", data.getNamespaceURI()); |
182 |
assertEquals("correct element namespace", "urn:test:shared", data.getNamespaceURI()); |
184 |
Element stuff = Util.findElement(data, "shared-stuff", "urn:test:shared"); |
183 |
Element stuff = XMLUtil.findElement(data, "shared-stuff", "urn:test:shared"); |
185 |
/* This now retains the former contents: |
184 |
/* This now retains the former contents: |
186 |
assertNull("had no stuff in it", stuff); |
185 |
assertNull("had no stuff in it", stuff); |
187 |
*/ |
186 |
*/ |
Lines 192-204
Link Here
|
192 |
pm.saveProject(p); |
191 |
pm.saveProject(p); |
193 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
192 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
194 |
Element root = doc.getDocumentElement(); |
193 |
Element root = doc.getDocumentElement(); |
195 |
Element type = Util.findElement(root, "type", AntProjectHelper.PROJECT_NS); |
194 |
Element type = XMLUtil.findElement(root, "type", AntProjectHelper.PROJECT_NS); |
196 |
assertEquals("correct restored type", "test", Util.findText(type)); |
195 |
assertEquals("correct restored type", "test", XMLUtil.findText(type)); |
197 |
Element config = Util.findElement(root, "configuration", AntProjectHelper.PROJECT_NS); |
196 |
Element config = XMLUtil.findElement(root, "configuration", AntProjectHelper.PROJECT_NS); |
198 |
assertNotNull("have <configuration>", config); |
197 |
assertNotNull("have <configuration>", config); |
199 |
data = Util.findElement(config, "data", "urn:test:shared"); |
198 |
data = XMLUtil.findElement(config, "data", "urn:test:shared"); |
200 |
assertNotNull("have <data>", data); |
199 |
assertNotNull("have <data>", data); |
201 |
Element details = Util.findElement(data, "details", "urn:test:shared"); |
200 |
Element details = XMLUtil.findElement(data, "details", "urn:test:shared"); |
202 |
assertNotNull("have <details>", details); |
201 |
assertNotNull("have <details>", details); |
203 |
} |
202 |
} |
204 |
|
203 |
|
Lines 463-469
Link Here
|
463 |
public void testPutPrimaryConfigurationData() throws Exception { |
462 |
public void testPutPrimaryConfigurationData() throws Exception { |
464 |
h.addAntProjectListener(l); |
463 |
h.addAntProjectListener(l); |
465 |
Element data = h.getPrimaryConfigurationData(true); |
464 |
Element data = h.getPrimaryConfigurationData(true); |
466 |
assertNotNull("<shared-stuff/> is there to start", Util.findElement(data, "shared-stuff", "urn:test:shared")); |
465 |
assertNotNull("<shared-stuff/> is there to start", XMLUtil.findElement(data, "shared-stuff", "urn:test:shared")); |
467 |
assertTrue("project is not initially modified", !pm.isModified(p)); |
466 |
assertTrue("project is not initially modified", !pm.isModified(p)); |
468 |
assertEquals("gPCD fires no events", 0, l.events().length); |
467 |
assertEquals("gPCD fires no events", 0, l.events().length); |
469 |
assertNotNull("config data has an owner document", data.getOwnerDocument()); |
468 |
assertNotNull("config data has an owner document", data.getOwnerDocument()); |
Lines 471-477
Link Here
|
471 |
data.appendChild(nue); |
470 |
data.appendChild(nue); |
472 |
assertTrue("project is not modified after uncommitted change", !pm.isModified(p)); |
471 |
assertTrue("project is not modified after uncommitted change", !pm.isModified(p)); |
473 |
assertEquals("no events fired after uncommitted change", 0, l.events().length); |
472 |
assertEquals("no events fired after uncommitted change", 0, l.events().length); |
474 |
assertEquals("after uncommitted change gPCD does not yet have new <misc/>", null, Util.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared")); |
473 |
assertEquals("after uncommitted change gPCD does not yet have new <misc/>", null, XMLUtil.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared")); |
475 |
h.putPrimaryConfigurationData(data, true); |
474 |
h.putPrimaryConfigurationData(data, true); |
476 |
assertTrue("project is modified after committed change", pm.isModified(p)); |
475 |
assertTrue("project is modified after committed change", pm.isModified(p)); |
477 |
AntProjectEvent[] evs = l.events(); |
476 |
AntProjectEvent[] evs = l.events(); |
Lines 479-506
Link Here
|
479 |
assertEquals("correct helper", h, evs[0].getHelper()); |
478 |
assertEquals("correct helper", h, evs[0].getHelper()); |
480 |
assertEquals("correct path", AntProjectHelper.PROJECT_XML_PATH, evs[0].getPath()); |
479 |
assertEquals("correct path", AntProjectHelper.PROJECT_XML_PATH, evs[0].getPath()); |
481 |
assertTrue("expected change", evs[0].isExpected()); |
480 |
assertTrue("expected change", evs[0].isExpected()); |
482 |
nue = Util.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared"); |
481 |
nue = XMLUtil.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared"); |
483 |
assertNotNull("after committed change gPCD has new <misc/>", nue); |
482 |
assertNotNull("after committed change gPCD has new <misc/>", nue); |
484 |
assertEquals("new element name is correct", "misc", nue.getLocalName()); |
483 |
assertEquals("new element name is correct", "misc", nue.getLocalName()); |
485 |
assertEquals("new element namespace is correct", "urn:test:shared", nue.getNamespaceURI()); |
484 |
assertEquals("new element namespace is correct", "urn:test:shared", nue.getNamespaceURI()); |
486 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
485 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
487 |
Element configuration = Util.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
486 |
Element configuration = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
488 |
assertNotNull("still has <configuration> on disk", configuration); |
487 |
assertNotNull("still has <configuration> on disk", configuration); |
489 |
data = Util.findElement(configuration, "data", "urn:test:shared"); |
488 |
data = XMLUtil.findElement(configuration, "data", "urn:test:shared"); |
490 |
assertNotNull("still has <data> on disk", data); |
489 |
assertNotNull("still has <data> on disk", data); |
491 |
nue = Util.findElement(data, "misc", "urn:test:shared"); |
490 |
nue = XMLUtil.findElement(data, "misc", "urn:test:shared"); |
492 |
assertEquals("<misc/> not yet on disk", null, nue); |
491 |
assertEquals("<misc/> not yet on disk", null, nue); |
493 |
pm.saveProject(p); |
492 |
pm.saveProject(p); |
494 |
assertTrue("project is not modified after save", !pm.isModified(p)); |
493 |
assertTrue("project is not modified after save", !pm.isModified(p)); |
495 |
assertEquals("saving changes fires no new events", 0, l.events().length); |
494 |
assertEquals("saving changes fires no new events", 0, l.events().length); |
496 |
nue = Util.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared"); |
495 |
nue = XMLUtil.findElement(h.getPrimaryConfigurationData(true), "misc", "urn:test:shared"); |
497 |
assertNotNull("after save gPCD still has new <misc/>", nue); |
496 |
assertNotNull("after save gPCD still has new <misc/>", nue); |
498 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
497 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
499 |
configuration = Util.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
498 |
configuration = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
500 |
assertNotNull("still has <configuration> on disk", configuration); |
499 |
assertNotNull("still has <configuration> on disk", configuration); |
501 |
data = Util.findElement(configuration, "data", "urn:test:shared"); |
500 |
data = XMLUtil.findElement(configuration, "data", "urn:test:shared"); |
502 |
assertNotNull("still has <data> on disk", data); |
501 |
assertNotNull("still has <data> on disk", data); |
503 |
nue = Util.findElement(data, "misc", "urn:test:shared"); |
502 |
nue = XMLUtil.findElement(data, "misc", "urn:test:shared"); |
504 |
assertNotNull("<misc/> now on disk", nue); |
503 |
assertNotNull("<misc/> now on disk", nue); |
505 |
// #42147: changes made on disk should result in firing of an AntProjectEvent |
504 |
// #42147: changes made on disk should result in firing of an AntProjectEvent |
506 |
ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction<Void>() { |
505 |
ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction<Void>() { |
Lines 516-527
Link Here
|
516 |
assertFalse("unexpected change", evs[0].isExpected()); |
515 |
assertFalse("unexpected change", evs[0].isExpected()); |
517 |
assertEquals("correct new display name", "Some New Name", ProjectUtils.getInformation(p).getDisplayName()); |
516 |
assertEquals("correct new display name", "Some New Name", ProjectUtils.getInformation(p).getDisplayName()); |
518 |
data = h.getPrimaryConfigurationData(true); |
517 |
data = h.getPrimaryConfigurationData(true); |
519 |
Element stuff = Util.findElement(data, "other-shared-stuff", "urn:test:shared"); |
518 |
Element stuff = XMLUtil.findElement(data, "other-shared-stuff", "urn:test:shared"); |
520 |
assertNotNull("have <other-shared-stuff/> now", stuff); |
519 |
assertNotNull("have <other-shared-stuff/> now", stuff); |
521 |
AuxiliaryConfiguration aux = p.getLookup().lookup(AuxiliaryConfiguration.class); |
520 |
AuxiliaryConfiguration aux = p.getLookup().lookup(AuxiliaryConfiguration.class); |
522 |
data = aux.getConfigurationFragment("data", "urn:test:shared-aux", true); |
521 |
data = aux.getConfigurationFragment("data", "urn:test:shared-aux", true); |
523 |
assertNotNull("have aux <data>", data); |
522 |
assertNotNull("have aux <data>", data); |
524 |
stuff = Util.findElement(data, "other-aux-shared-stuff", "urn:test:shared-aux"); |
523 |
stuff = XMLUtil.findElement(data, "other-aux-shared-stuff", "urn:test:shared-aux"); |
525 |
assertNotNull("have <other-aux-shared-stuff/> now", stuff); |
524 |
assertNotNull("have <other-aux-shared-stuff/> now", stuff); |
526 |
// XXX try private.xml too |
525 |
// XXX try private.xml too |
527 |
// XXX try modifying both XML files, or different parts of the same, and saving in a batch |
526 |
// XXX try modifying both XML files, or different parts of the same, and saving in a batch |
Lines 551-557
Link Here
|
551 |
assertNotNull("found shared <data>", data); |
550 |
assertNotNull("found shared <data>", data); |
552 |
assertEquals("correct name", "data", data.getLocalName()); |
551 |
assertEquals("correct name", "data", data.getLocalName()); |
553 |
assertEquals("correct namespace", "urn:test:shared-aux", data.getNamespaceURI()); |
552 |
assertEquals("correct namespace", "urn:test:shared-aux", data.getNamespaceURI()); |
554 |
Element stuff = Util.findElement(data, "aux-shared-stuff", "urn:test:shared-aux"); |
553 |
Element stuff = XMLUtil.findElement(data, "aux-shared-stuff", "urn:test:shared-aux"); |
555 |
assertNotNull("found <aux-shared-stuff/>", stuff); |
554 |
assertNotNull("found <aux-shared-stuff/>", stuff); |
556 |
assertEquals("gCF fires no changes", 0, l.events().length); |
555 |
assertEquals("gCF fires no changes", 0, l.events().length); |
557 |
// Check write of shared data. |
556 |
// Check write of shared data. |
Lines 567-577
Link Here
|
567 |
pm.saveProject(p); |
566 |
pm.saveProject(p); |
568 |
assertEquals("saving project fires no new changes", 0, l.events().length); |
567 |
assertEquals("saving project fires no new changes", 0, l.events().length); |
569 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
568 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
570 |
Element config = Util.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
569 |
Element config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
571 |
assertNotNull("<configuration> still exists", config); |
570 |
assertNotNull("<configuration> still exists", config); |
572 |
data = Util.findElement(config, "data", "urn:test:shared-aux"); |
571 |
data = XMLUtil.findElement(config, "data", "urn:test:shared-aux"); |
573 |
assertNotNull("<data> still exists", data); |
572 |
assertNotNull("<data> still exists", data); |
574 |
stuff = Util.findElement(data, "aux-shared-stuff", "urn:test:shared-aux"); |
573 |
stuff = XMLUtil.findElement(data, "aux-shared-stuff", "urn:test:shared-aux"); |
575 |
assertNotNull("still have <aux-shared-stuff/>", stuff); |
574 |
assertNotNull("still have <aux-shared-stuff/>", stuff); |
576 |
assertEquals("attr written correctly", "val", stuff.getAttribute("attr")); |
575 |
assertEquals("attr written correctly", "val", stuff.getAttribute("attr")); |
577 |
// Check read of private data. |
576 |
// Check read of private data. |
Lines 579-585
Link Here
|
579 |
assertNotNull("found shared <data>", data); |
578 |
assertNotNull("found shared <data>", data); |
580 |
assertEquals("correct name", "data", data.getLocalName()); |
579 |
assertEquals("correct name", "data", data.getLocalName()); |
581 |
assertEquals("correct namespace", "urn:test:private-aux", data.getNamespaceURI()); |
580 |
assertEquals("correct namespace", "urn:test:private-aux", data.getNamespaceURI()); |
582 |
stuff = Util.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
581 |
stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
583 |
assertNotNull("found <aux-private-stuff/>", stuff); |
582 |
assertNotNull("found <aux-private-stuff/>", stuff); |
584 |
assertEquals("gCF fires no changes", 0, l.events().length); |
583 |
assertEquals("gCF fires no changes", 0, l.events().length); |
585 |
// Check write of private data. |
584 |
// Check write of private data. |
Lines 596-604
Link Here
|
596 |
assertEquals("saving project fires no new changes", 0, l.events().length); |
595 |
assertEquals("saving project fires no new changes", 0, l.events().length); |
597 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH); |
596 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH); |
598 |
config = doc.getDocumentElement(); |
597 |
config = doc.getDocumentElement(); |
599 |
data = Util.findElement(config, "data", "urn:test:private-aux"); |
598 |
data = XMLUtil.findElement(config, "data", "urn:test:private-aux"); |
600 |
assertNotNull("<data> still exists", data); |
599 |
assertNotNull("<data> still exists", data); |
601 |
stuff = Util.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
600 |
stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
602 |
assertNotNull("still have <aux-private-stuff/>", stuff); |
601 |
assertNotNull("still have <aux-private-stuff/>", stuff); |
603 |
assertEquals("attr written correctly", "val", stuff.getAttribute("attr")); |
602 |
assertEquals("attr written correctly", "val", stuff.getAttribute("attr")); |
604 |
// Check that missing fragments are not returned. |
603 |
// Check that missing fragments are not returned. |
Lines 625-635
Link Here
|
625 |
data = aux.getConfigurationFragment("hello", "urn:test:whatever", true); |
624 |
data = aux.getConfigurationFragment("hello", "urn:test:whatever", true); |
626 |
assertNotNull("can retrieve new frag", data); |
625 |
assertNotNull("can retrieve new frag", data); |
627 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
626 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
628 |
config = Util.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
627 |
config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
629 |
assertNotNull("<configuration> still exists", config); |
628 |
assertNotNull("<configuration> still exists", config); |
630 |
data = Util.findElement(config, "hello", "urn:test:whatever"); |
629 |
data = XMLUtil.findElement(config, "hello", "urn:test:whatever"); |
631 |
assertNotNull("<hello> still exists", data); |
630 |
assertNotNull("<hello> still exists", data); |
632 |
assertEquals("correct nested contents too", "stuff", Util.findText(data)); |
631 |
assertEquals("correct nested contents too", "stuff", XMLUtil.findText(data)); |
633 |
// Try removing a fragment. |
632 |
// Try removing a fragment. |
634 |
assertFalse("project is unmodified", pm.isModified(p)); |
633 |
assertFalse("project is unmodified", pm.isModified(p)); |
635 |
assertTrue("can remove new frag", aux.removeConfigurationFragment("hello", "urn:test:whatever", true)); |
634 |
assertTrue("can remove new frag", aux.removeConfigurationFragment("hello", "urn:test:whatever", true)); |
Lines 637-645
Link Here
|
637 |
assertNull("now frag is gone", aux.getConfigurationFragment("hello", "urn:test:whatever", true)); |
636 |
assertNull("now frag is gone", aux.getConfigurationFragment("hello", "urn:test:whatever", true)); |
638 |
pm.saveProject(p); |
637 |
pm.saveProject(p); |
639 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
638 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
640 |
config = Util.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
639 |
config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
641 |
assertNotNull("<configuration> still exists", config); |
640 |
assertNotNull("<configuration> still exists", config); |
642 |
data = Util.findElement(config, "hello", "urn:test:whatever"); |
641 |
data = XMLUtil.findElement(config, "hello", "urn:test:whatever"); |
643 |
assertNull("now <hello> is gone", data); |
642 |
assertNull("now <hello> is gone", data); |
644 |
assertFalse("cannot remove a frag that is not there", aux.removeConfigurationFragment("hello", "urn:test:whatever", true)); |
643 |
assertFalse("cannot remove a frag that is not there", aux.removeConfigurationFragment("hello", "urn:test:whatever", true)); |
645 |
assertFalse("trying to remove a nonexistent frag does not modify project", pm.isModified(p)); |
644 |
assertFalse("trying to remove a nonexistent frag does not modify project", pm.isModified(p)); |
Lines 659-665
Link Here
|
659 |
aux.putConfigurationFragment(data, true); |
658 |
aux.putConfigurationFragment(data, true); |
660 |
pm.saveProject(p); |
659 |
pm.saveProject(p); |
661 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
660 |
doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PROJECT_XML_PATH); |
662 |
config = Util.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
661 |
config = XMLUtil.findElement(doc.getDocumentElement(), "configuration", AntProjectHelper.PROJECT_NS); |
663 |
String[] names = new String[]{"aaa-namespace", "aaaa-namespace", "bbb-name-sp", "bbb-namespace", "bbb-namespace-1", "ccc-namespace", "data-urn:test:shared", "data-urn:test:shared-aux"}; |
662 |
String[] names = new String[]{"aaa-namespace", "aaaa-namespace", "bbb-name-sp", "bbb-namespace", "bbb-namespace-1", "ccc-namespace", "data-urn:test:shared", "data-urn:test:shared-aux"}; |
664 |
int count = 0; |
663 |
int count = 0; |
665 |
NodeList list = config.getChildNodes(); |
664 |
NodeList list = config.getChildNodes(); |
Lines 684-690
Link Here
|
684 |
assertNotNull("AuxiliaryConfiguration present", aux); |
683 |
assertNotNull("AuxiliaryConfiguration present", aux); |
685 |
|
684 |
|
686 |
Element data = aux.getConfigurationFragment("data", "urn:test:private-aux", false); |
685 |
Element data = aux.getConfigurationFragment("data", "urn:test:private-aux", false); |
687 |
Element stuff = Util.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
686 |
Element stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
688 |
assertNotNull("found <aux-private-stuff/>", stuff); |
687 |
assertNotNull("found <aux-private-stuff/>", stuff); |
689 |
// Check write of private data. |
688 |
// Check write of private data. |
690 |
stuff.setAttribute("attr", "val"); |
689 |
stuff.setAttribute("attr", "val"); |
Lines 710-718
Link Here
|
710 |
//check the data are written: |
709 |
//check the data are written: |
711 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH); |
710 |
Document doc = AntBasedTestUtil.slurpXml(h, AntProjectHelper.PRIVATE_XML_PATH); |
712 |
Element config = doc.getDocumentElement(); |
711 |
Element config = doc.getDocumentElement(); |
713 |
data = Util.findElement(config, "data", "urn:test:private-aux"); |
712 |
data = XMLUtil.findElement(config, "data", "urn:test:private-aux"); |
714 |
assertNotNull("<data> still exists", data); |
713 |
assertNotNull("<data> still exists", data); |
715 |
stuff = Util.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
714 |
stuff = XMLUtil.findElement(data, "aux-private-stuff", "urn:test:private-aux"); |
716 |
assertNotNull("still have <aux-private-stuff/>", stuff); |
715 |
assertNotNull("still have <aux-private-stuff/>", stuff); |
717 |
assertEquals("attr written correctly", "val", stuff.getAttribute("attr")); |
716 |
assertEquals("attr written correctly", "val", stuff.getAttribute("attr")); |
718 |
|
717 |
|