[NETBEANS-54] Modules review xml.xdm - no external library - checked Rat report: excluded test-data from rat (no IP value) - disable tests that fail because referenced files were not donated - skimmed through module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/9ee72106 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/9ee72106 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/9ee72106 Branch: refs/heads/master Commit: 9ee72106afac864a1e518d45b77fe1be277f19f4 Parents: a948b44 Author: Matthias Bläsing <[email protected]> Authored: Fri Oct 6 21:26:57 2017 +0200 Committer: Matthias Bläsing <[email protected]> Committed: Wed Oct 11 19:04:53 2017 +0200 ---------------------------------------------------------------------- nbbuild/build.xml | 4 ++++ .../unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java | 3 ++- .../org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java | 5 +++-- .../org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java | 9 ++++++--- .../netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java | 3 ++- .../netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java | 7 ++++--- .../modules/xml/xdm/visitor/FindNamespaceVisitorTest.java | 5 +++-- .../netbeans/modules/xml/xdm/visitor/XPathFinderTest.java | 5 +++-- 8 files changed, 27 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/nbbuild/build.xml ---------------------------------------------------------------------- diff --git a/nbbuild/build.xml b/nbbuild/build.xml index ca3ab8f..8f85aca 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1978,6 +1978,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file--> <exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data --> <exclude name="xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/**" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.wsdl" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xml" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xsd" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.bpel" /> <!-- test data --> <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting --> <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting --> <exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data --> http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java index 491e019..a2c846f 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java @@ -61,7 +61,8 @@ public class XDMModelTest extends TestCase { suite.addTest(new XDMModelTest("testModifyNegative")); suite.addTest(new XDMModelTest("testSyncAndNamespace")); suite.addTest(new XDMModelTest("testSyncToEmptyRoot")); - suite.addTest(new XDMModelTest("testXDMModelSize")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XDMModelTest("testXDMModelSize")); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java index 6d9a5e8..70025ce 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java @@ -52,8 +52,9 @@ public class DiffFinderTest extends TestCase { suite.addTest(new DiffFinderTest("testFindDiff1")); suite.addTest(new DiffFinderTest("testFindDiff2")); suite.addTest(new DiffFinderTest("testFindDiff3")); - suite.addTest(new DiffFinderTest("testFindDiffPerf")); - suite.addTest(new DiffFinderTest("testFindDiffPerf2")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new DiffFinderTest("testFindDiffPerf")); +// suite.addTest(new DiffFinderTest("testFindDiffPerf2")); suite.addTest(new DiffFinderTest("testElementAddedBeforeChildAttributeChange")); suite.addTest(new DiffFinderTest("testElementAddedBeforeChildAttributeChange2")); return suite; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java index 4b119d9..5f773b0 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java @@ -77,12 +77,14 @@ public class MergeDiffTest extends TestCase { TestSuite suite = new TestSuite(); suite.addTest(new MergeDiffTest("testMerge1")); suite.addTest(new MergeDiffTest("testMerge2")); - suite.addTest(new MergeDiffTest("testMerge3")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new MergeDiffTest("testMerge3")); suite.addTest(new MergeDiffTest("testMerge4")); suite.addTest(new MergeDiffTest("testMerge5")); suite.addTest(new MergeDiffTest("testMerge6")); suite.addTest(new MergeDiffTest("testMerge7")); - suite.addTest(new MergeDiffTest("testMerge8")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new MergeDiffTest("testMerge8")); suite.addTest(new MergeDiffTest("testMerge9")); suite.addTest(new MergeDiffTest("testMerge10")); suite.addTest(new MergeDiffTest("testPrettyPrint")); @@ -94,7 +96,8 @@ public class MergeDiffTest extends TestCase { suite.addTest(new MergeDiffTest("testPosChange3")); suite.addTest(new MergeDiffTest("testPosChange3_2")); suite.addTest(new MergeDiffTest("testPosChange3_3")); - suite.addTest(new MergeDiffTest("testMergeVenetianBlindPO")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new MergeDiffTest("testMergeVenetianBlindPO")); suite.addTest(new MergeDiffTest("testForwardReorderNodeWithChangesOnChildren")); suite.addTest(new MergeDiffTest("testMergeReformatDiff")); return suite; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java index 73dcd38..c3cdbb6 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java @@ -62,7 +62,8 @@ public class XMLSyntaxParserTest extends TestCase { suite.addTest(new XMLSyntaxParserTest("testParseTestXML")); suite.addTest(new XMLSyntaxParserTest("testMultiRootXML")); suite.addTest(new XMLSyntaxParserTest("testParseWSDL")); - suite.addTest(new XMLSyntaxParserTest("testParsePerformace")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XMLSyntaxParserTest("testParsePerformace")); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java index 5e3ce6d..f84d315 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java @@ -87,9 +87,10 @@ public class XDMPerfNumberTest extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new XDMPerfNumberTest("testReadUsingDOM")); - suite.addTest(new XDMPerfNumberTest("testReadUsingSyntaxParser")); - suite.addTest(new XDMPerfNumberTest("testReadUsingXDM")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XDMPerfNumberTest("testReadUsingDOM")); +// suite.addTest(new XDMPerfNumberTest("testReadUsingSyntaxParser")); +// suite.addTest(new XDMPerfNumberTest("testReadUsingXDM")); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java index b1aaf7d..cfb21cd 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java @@ -52,8 +52,9 @@ public class FindNamespaceVisitorTest extends TestCase { } public static Test suite() { - TestSuite suite = new TestSuite(FindNamespaceVisitorTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTestSuite(FindNamespaceVisitorTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9ee72106/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java ---------------------------------------------------------------------- diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java index 83c9282..5473081 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java @@ -46,8 +46,9 @@ public class XPathFinderTest extends TestCase { } public static Test suite() { - TestSuite suite = new TestSuite(XPathFinderTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTestSuite(XPathFinderTest.class); return suite; }
