Author: yzhishko
Date: 2009-12-08 08:47:35 -0500 (Tue, 08 Dec 2009)
New Revision: 19102
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/build.properties
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/pieChart.xhtml.xml
Log:
Fixed junit (seam-pdf: pieChart, lineChart, barChart) tests failures on hudson.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/build.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/build.properties 2009-12-08 11:22:11
UTC (rev 19101)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/build.properties 2009-12-08 13:47:35
UTC (rev 19102)
@@ -5,7 +5,9 @@
plugin.xml,\
lib/,\
lib/antlr.jar,\
+ resources/,\
templates/,\
plugin.properties
src.includes = templates/,\
+ resources/,\
src/
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java 2009-12-08
11:22:11 UTC (rev 19101)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java 2009-12-08
13:47:35 UTC (rev 19102)
@@ -63,7 +63,7 @@
NodeList children = sourceElement.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
if (children.item(i) instanceof Element) {
- if (children.item(i).getNodeName().endsWith(":title")) { //$NON-NLS-1$
+ if (children.item(i).getNodeName().endsWith("title")) { //$NON-NLS-1$
sourceTitleNode = children.item(i);
}
}
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java 2009-12-08
11:22:11 UTC (rev 19101)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java 2009-12-08
13:47:35 UTC (rev 19102)
@@ -88,7 +88,7 @@
int sectionNum = 0;
NodeList children = parentSection.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
- if (children.item(i).getNodeName().endsWith(":section")) { //$NON-NLS-1$
+ if (children.item(i).getNodeName().endsWith("section")) { //$NON-NLS-1$
sectionNum++;
if (children.item(i) == sourceElement) {
sectionNumberString.insert(0, Integer
@@ -106,7 +106,7 @@
int sectionNum = 0;
NodeList children = parentChapter.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
- if (children.item(i).getNodeName().endsWith(":section")) { //$NON-NLS-1$
+ if (children.item(i).getNodeName().endsWith("section")) { //$NON-NLS-1$
sectionNum++;
if (children.item(i) == sourceElement) {
sectionNumberString.insert(0, Integer
@@ -141,7 +141,7 @@
NodeList children = sourceElement.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
if (children.item(i) instanceof Element) {
- if (children.item(i).getNodeName().endsWith(":title")) { //$NON-NLS-1$
+ if (children.item(i).getNodeName().endsWith("title")) { //$NON-NLS-1$
sourceTitleNode = children.item(i);
}
}
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2009-12-08
11:22:11 UTC (rev 19101)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2009-12-08
13:47:35 UTC (rev 19102)
@@ -119,7 +119,10 @@
for (int i = 0; i < cellsLength; i++) {
nsIDOMNode visualCell = pageContext.getDomMapping().getVisualNode(
cells[i]);
- nsIDOMNode parentNode = visualCell.getParentNode();
+ nsIDOMNode parentNode = null;
+ if (visualCell != null) {
+ parentNode = visualCell.getParentNode();
+ }
if (parentNode != null) {
parentNode.removeChild(visualCell);
trVisualNode.appendChild(visualCell);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/pieChart.xhtml.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/pieChart.xhtml.xml 2009-12-08
11:22:11 UTC (rev 19101)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/pdf/pieChart.xhtml.xml 2009-12-08
13:47:35 UTC (rev 19102)
@@ -2,7 +2,7 @@
<test id="piechartID1">
<IMG SRC="/.*resources/pieChart/pieChart.png/" STYLE="width: 508px;
height: 615px;" />
</test>
- <test id="piechartID1">
+ <test id="piechartID2">
<IMG SRC="/.*resources/pieChart/pieChartSeriesNested.png/" />
</test>
</tests>
\ No newline at end of file
Show replies by date