Project

General

Profile

« Previous | Next » 

Revision afb0c9af

Added by Andreas Kohlbecker about 8 years ago

updating and fixing PolytomousKey for FloraMalesiana

View differences:

src/main/java/eu/etaxonomy/dataportal/pages/PolytomousKeyPage.java
79 79
		String edgeText = null;
80 80
		LinkClass linkClass = null;
81 81
		String linkText = null;
82
        String suffix = "";
82 83

  
83 84

  
84 85
		public String getNodeNumber() {
......
97 98
			return linkText;
98 99
		}
99 100

  
101
		public String getLinkTextWithSuffix() {
102
            return linkText + (suffix != null ? suffix : "");
103
        }
104

  
100 105
		public KeyLineData(String nodeNumber, String edgeText, LinkClass linkClass, String linkText) {
101 106
			this.nodeNumber = nodeNumber;
102 107
			this.edgeText = edgeText;
103 108
			this.linkClass = linkClass;
104 109
			this.linkText = linkText;
105 110
		}
111

  
112
		/**
113
		 *
114
		 * @param nodeNumber
115
		 * @param edgeText
116
		 * @param linkClass
117
		 * @param linkText
118
		 * @param suffix In cases where the linkText is a taxonName the link may be suffixed with the nomenclatural reference.
119
		 */
120
		public KeyLineData(String nodeNumber, String edgeText, LinkClass linkClass, String linkText, String suffix) {
121
            this.nodeNumber = nodeNumber;
122
            this.edgeText = edgeText;
123
            this.linkClass = linkClass;
124
            this.linkText = linkText;
125
            this.suffix = suffix;
126
        }
106 127
	}
107 128

  
108 129
	public enum LinkClass {
......
115 136
		keyTableRows = keyTable.findElements(By.xpath("tbody/tr"));
116 137
		WebElement keyEntry = keyTableRows.get(lineIndex);
117 138
		Assert.assertEquals("node number", data.nodeNumber, keyEntry.findElement(By.className("nodeNumber")).getText());
118
		Assert.assertEquals("edge text", data.edgeText + "\n" + data.linkText, keyEntry.findElement(By.className("edge")).getText());
139
		Assert.assertEquals("edge text", composeFullEdgeText(data), keyEntry.findElement(By.className("edge")).getText());
119 140
		WebElement linkContainer = keyEntry.findElement(By.className(data.linkClass.name()));
120 141
		WebElement link = linkContainer.findElement(By.tagName("a"));
121 142
		Assert.assertEquals("link text", data.linkText, link.getText());
......
142 163
		return nextPage;
143 164
	}
144 165

  
166
    /**
167
     * @param data
168
     * @return
169
     */
170
    private String composeFullEdgeText(KeyLineData data) {
171
        return data.edgeText + "\n" + data.getLinkTextWithSuffix();
172
    }
173

  
145 174

  
146 175

  
147 176

  

Also available in: Unified diff