eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

addressing comment #17 of bug 2112, failing Selenium tests after introducing the checkboxes in cell tables for selection

Browse Source
This commit is contained in:
Axel Uhl committed 2014-08-07 01:04:23 +02:00
1 parent 2ba85d0afd
commit 39da818aa2
8 files changed
+38 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardConfigurationPanelPO.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class LeaderboardConfigurationPanelPO extends PageArea {
}
public String getName() {
return getColumnContent(0);
return getColumnContent("Name");
}
public String getLeaderboardURL() {
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardDetailsPanelPO.java
+13 -13
View File
@@ -128,11 +128,11 @@ public class LeaderboardDetailsPanelPO extends PageArea {
CellTablePO<DataEntryPO> racesTable = getRacesTable();
for(DataEntryPO entry : racesTable.getEntries()) {
String name = entry.getColumnContent(0);
String fleet = entry.getColumnContent(1);
//String medalRace = entry.getColumnContent(2);
//String linked = entry.getColumnContent(3);
//String factor = entry.getColumnContent(4);
String name = entry.getColumnContent("Race");
String fleet = entry.getColumnContent("Fleet");
//String medalRace = entry.getColumnContent("Medal Race");
//String linked = entry.getColumnContent("Is linked");
//String factor = entry.getColumnContent("Factor");
result.add(new RaceDescriptor(name, fleet, false, false, 0.0));
}
@@ -185,11 +185,11 @@ public class LeaderboardDetailsPanelPO extends PageArea {
CellTablePO<DataEntryPO> racesTable = getRacesTable();
for(DataEntryPO entry : racesTable.getEntries()) {
String name = entry.getColumnContent(0);
String fleet = entry.getColumnContent(1);
//String medalRace = entry.getColumnContent(2);
//String linked = entry.getColumnContent(3);
//String factor = entry.getColumnContent(4);
String name = entry.getColumnContent("Race");
String fleet = entry.getColumnContent("Fleet");
//String medalRace = entry.getColumnContent("Medal Race");
//String linked = entry.getColumnContent("Is linked");
//String factor = entry.getColumnContent("Factor");
RaceDescriptor descriptor = new RaceDescriptor(name, fleet, false, false, 0.0);
@@ -204,9 +204,9 @@ public class LeaderboardDetailsPanelPO extends PageArea {
CellTablePO<DataEntryPO> trackingTable = getTrackedRacesTable();
for(DataEntryPO entry : trackingTable.getEntries()) {
String regatta = entry.getColumnContent(0);
String boatClass = entry.getColumnContent(1);
String raceName = entry.getColumnContent(2);
String regatta = entry.getColumnContent("Regatta");
String boatClass = entry.getColumnContent("Boat Class");
String raceName = entry.getColumnContent("Race");
TrackedRaceDescriptor descriptor = new TrackedRaceDescriptor(regatta, boatClass, raceName);
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/RegattaDetailsCompositePO.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class RegattaDetailsCompositePO extends PageArea {
private DataEntryPO findSeries(String series) {
CellTablePO<DataEntryPO> table = getSeriesTable();
for (DataEntryPO entry : table.getEntries()) {
String name = entry.getColumnContent(0);
String name = entry.getColumnContent("Series");
if (series.equals(name)) {
return entry;
}
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/RegattaListCompositePO.java
+3 -3
View File
@@ -104,8 +104,8 @@ public class RegattaListCompositePO extends PageArea {
CellTablePO<DataEntryPO> table = getRegattasTable();
for(DataEntryPO entry : table.getEntries()) {
String name = entry.getColumnContent(0);
String boatClass = entry.getColumnContent(1);
String name = entry.getColumnContent("Regatta name");
String boatClass = entry.getColumnContent("Boat Class");
descriptors.add(new RegattaDescriptor(name, boatClass));
}
@@ -150,7 +150,7 @@ public class RegattaListCompositePO extends PageArea {
CellTablePO<DataEntryPO> table = getRegattasTable();
for(DataEntryPO entry : table.getEntries()) {
String name = entry.getColumnContent(0);
String name = entry.getColumnContent("Regatta name");
// String boatClass = columns.getColumnContent(1);
//
// if(regatta.equals(new RegattaDescriptor(name, boatClass)))
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesListPO.java
+7 -7
View File
@@ -153,10 +153,10 @@ public class TrackedRacesListPO extends PageArea {
CellTablePO<DataEntryPO> table = getTrackedRacesTable();
for(DataEntryPO entry : table.getEntries()) {
String regatta = entry.getColumnContent(0);
String boatClass = entry.getColumnContent(1);
String race = entry.getColumnContent(2);
String status = entry.getColumnContent(6);
String regatta = entry.getColumnContent("Regatta");
String boatClass = entry.getColumnContent("Boat Class");
String race = entry.getColumnContent("Race");
String status = entry.getColumnContent("Status");
TrackedRaceDescriptor descriptor = new TrackedRaceDescriptor(regatta, boatClass, race);
@@ -277,9 +277,9 @@ public class TrackedRacesListPO extends PageArea {
while(iterator.hasNext()) {
DataEntryPO entry = iterator.next();
String regatta = entry.getColumnContent(0);
String boatClass = entry.getColumnContent(1);
String race = entry.getColumnContent(2);
String regatta = entry.getColumnContent("Regatta");
String boatClass = entry.getColumnContent("Boat Class");
String race = entry.getColumnContent("Race");
TrackedRaceDescriptor descriptor = new TrackedRaceDescriptor(regatta, boatClass, race);
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tractrac/TracTracEventManagementPanelPO.java
+6 -6
View File
@@ -170,9 +170,9 @@ public class TracTracEventManagementPanelPO extends PageArea {
CellTablePO<DataEntryPO> table = getTrackableRacesTable();
for(DataEntryPO entry : table.getEntries()) {
String event = entry.getColumnContent(0);
String race = entry.getColumnContent(1);
String boatClass = entry.getColumnContent(2);
String event = entry.getColumnContent("Event");
String race = entry.getColumnContent("Race");
String boatClass = entry.getColumnContent("Boat Class");
descriptors.add(new TrackableRaceDescriptor(event, race, boatClass));
}
@@ -239,9 +239,9 @@ public class TracTracEventManagementPanelPO extends PageArea {
Iterator<DataEntryPO> iterator = entries.iterator();
while (iterator.hasNext()) {
DataEntryPO entry = iterator.next();
String event = entry.getColumnContent(0);
String race = entry.getColumnContent(1);
String boatClass = entry.getColumnContent(2);
String event = entry.getColumnContent("Event");
String race = entry.getColumnContent("Race");
String boatClass = entry.getColumnContent("Boat Class");
TrackableRaceDescriptor descriptor = new TrackableRaceDescriptor(event, race, boatClass);
if (!races.contains(descriptor)) {
iterator.remove();
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardTablePO.java
+3 -3
View File
@@ -17,9 +17,9 @@ import com.sap.sailing.selenium.pages.leaderboard.LeaderboardTablePO.Leaderboard
public class LeaderboardTablePO extends CellTablePO<LeaderboardEntry> {
public static class LeaderboardEntry extends DataEntryPO {
private static final int TOTAL_RANK_COLUMN = 0;
private static final int COMPETITOR_COLUMN = 1;
private static final int NAME_COLUMN = 2;
private static final String TOTAL_RANK_COLUMN = "Regatta Rank";
private static final String COMPETITOR_COLUMN = "Competitor";
private static final String NAME_COLUMN = "Name";
private static final String TOTAL_POINTS_COLUMN = "Σ";
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestColumnsInLeaderboard.java
+4 -4
View File
@@ -69,17 +69,17 @@ public class TestColumnsInLeaderboard extends AbstractSeleniumTest {
stateHasChanged = false;
// Since this test is very expensive we iterate from the end to the beginning because the lower
// indexes are still valid after the expansion of a column.
for(int i = headers.size() - 1; i >= 0; i--) {
if(leaderboardTable.isColumnExpandable(i) && !leaderboardTable.isColumnExpanded(i)) {
for (int i = headers.size() - 1; i >= 0; i--) {
if (leaderboardTable.isColumnExpandable(i) && !leaderboardTable.isColumnExpanded(i)) {
leaderboardTable.expandColumn(i);
stateHasChanged = true;
List<LeaderboardEntry> entries = leaderboardTable.getEntries();
// NOTE: We have to resolve the headers again for the assertion since there should be more now
// because of the expansion
// because of the expansion
assertThat(entries.get(0).getNumberOfColumns(), equalTo(leaderboardTable.getColumnHeaders().size()));
}
}
} while(stateHasChanged);
} while (stateHasChanged);
}
private void configureLeaderboard() {