mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-18 18:20:58 +00:00
newSelectionModel: reviesed test case
This commit is contained in:
1 parent
97093cadce
commit
e867352d37
4 files changed
+44
-19
No files matched your search
+1
@@ -87,6 +87,7 @@ public class AssignRacesToMediaDialog extends DataEntryDialog<Set<RegattaAndRace
|
||||
hasRaceCandidates = false;
|
||||
this.trackedRacesListComposite.fillRegattas(result);
|
||||
for (RegattaAndRaceIdentifier assignedRace : mediaTrack.assignedRaces) {
|
||||
// TODO / FIXME Lukas: consider not to notify handlers, remind old implementation of TrackedRaceListComposite
|
||||
this.trackedRacesListComposite.selectRaceByIdentifier(assignedRace);
|
||||
}
|
||||
updateUI();
|
||||
|
||||
+17
-2
@@ -1,7 +1,6 @@
|
||||
package com.sap.sailing.selenium.pages.adminconsole.tractrac;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@@ -229,7 +228,23 @@ public class TracTracEventManagementPanelPO extends PageArea {
|
||||
}
|
||||
|
||||
public void startTrackingForRace(TrackableRaceDescriptor race) {
|
||||
startTrackingForRaces(Arrays.asList(race));
|
||||
//startTrackingForRaces(Arrays.asList(race));
|
||||
CellTablePO<DataEntryPO> table = getTrackableRacesTable();
|
||||
DataEntryPO entryToSelect = null;
|
||||
for (DataEntryPO entry : table.getEntries()) {
|
||||
TrackableRaceDescriptor entryDiscribtor = new TrackableRaceDescriptor(entry.getColumnContent("Event"),
|
||||
entry.getColumnContent("Race"), entry.getColumnContent("Boat Class"));
|
||||
if (race.equals(entryDiscribtor)) {
|
||||
entryToSelect = entry;
|
||||
break;
|
||||
}
|
||||
}
|
||||
table.selectEntry(entryToSelect);
|
||||
this.startTrackingButton.click();
|
||||
ExpectedCondition<Alert> condition = ExpectedConditions.alertIsPresent();
|
||||
if (condition.apply(this.driver) == null) {
|
||||
waitForAjaxRequests();
|
||||
}
|
||||
}
|
||||
|
||||
public void startTrackingForRaces(List<TrackableRaceDescriptor> races) {
|
||||
|
||||
+5
@@ -223,6 +223,11 @@ public abstract class CellTablePO<T extends DataEntryPO> extends PageArea {
|
||||
entry.select();
|
||||
}
|
||||
}
|
||||
public void deselectEntry(T entry) {
|
||||
if(this.getWebElement().equals(entry.table.getWebElement())) {
|
||||
entry.deselect();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Selects the specified entries.</p>
|
||||
|
||||
+21
-17
@@ -53,7 +53,7 @@ public class TestSmartphoneTrackingEventManagementPanel extends AbstractSelenium
|
||||
this.trackableRaces = new ArrayList<>();
|
||||
this.trackedRaces = new ArrayList<>();
|
||||
this.leaderboardRaces = new ArrayList<>();
|
||||
for (int i = 0; i <= 5; i++) {
|
||||
for (int i = 1; i < 6; i++) {
|
||||
String raceName = String.format(RACE, i);
|
||||
TrackableRaceDescriptor trackableRace = new TrackableRaceDescriptor(EVENT, raceName, BOAT_CLASS);
|
||||
TrackedRaceDescriptor trackedRace = new TrackedRaceDescriptor(this.regatta.toString(), BOAT_CLASS, raceName);
|
||||
@@ -74,7 +74,7 @@ public class TestSmartphoneTrackingEventManagementPanel extends AbstractSelenium
|
||||
LeaderboardConfigurationPanelPO leaderboardConfigurationPanelPO = adminConsole.goToLeaderboardConfiguration();
|
||||
LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfigurationPanelPO.getLeaderboardDetails(this.regatta.toString());
|
||||
|
||||
for (int i = 1; i < 6; i++) {
|
||||
for (int i = 0; i < 5; i++) {
|
||||
leaderboardDetails.linkRace(this.leaderboardRaces.get(i), this.trackedRaces.get(i));
|
||||
}
|
||||
|
||||
@@ -90,23 +90,27 @@ public class TestSmartphoneTrackingEventManagementPanel extends AbstractSelenium
|
||||
}
|
||||
assertNotNull(entryToSelect);
|
||||
leaderboards.selectEntry(entryToSelect);
|
||||
|
||||
RaceColumnTableWrapperPO raceColumnTableWrapper = smartphoneTrackingPanel.getRaceColumnTableWrapper();
|
||||
CellTablePO<DataEntryPO> raceColumnTable = raceColumnTableWrapper.getRaceColumnTable();
|
||||
// select RaceColumn
|
||||
DataEntryPO raceToSelect = null;
|
||||
for (DataEntryPO entry : raceColumnTable.getEntries()) {
|
||||
if (entry.getColumnContent("Race").equals(leaderboardRaces.get(1).getName())) {
|
||||
raceToSelect = entry;
|
||||
for (int i = 0; i < 5; i++) {
|
||||
RaceColumnTableWrapperPO raceColumnTableWrapper = smartphoneTrackingPanel.getRaceColumnTableWrapper();
|
||||
CellTablePO<DataEntryPO> raceColumnTable = raceColumnTableWrapper.getRaceColumnTable();
|
||||
// select RaceColumn
|
||||
DataEntryPO raceToSelect = null;
|
||||
for (DataEntryPO entry : raceColumnTable.getEntries()) {
|
||||
if (entry.getColumnContent("Race").equals(leaderboardRaces.get(i).getName())) {
|
||||
raceToSelect = entry;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assertNotNull(raceToSelect);
|
||||
raceColumnTable.selectEntry(raceToSelect);
|
||||
|
||||
TrackedRacesListPO trackedRaces = smartphoneTrackingPanel.getTrackedRaceListComposite();
|
||||
List<DataEntryPO> seleceted = trackedRaces.getTrackedRacesTable().getSelectedEntries();
|
||||
assertEquals(seleceted.size(), 1);
|
||||
assertEquals(this.trackedRaces.get(i).race, seleceted.get(0).getColumnContent("Race"));
|
||||
|
||||
raceColumnTable.deselectEntry(raceToSelect);
|
||||
}
|
||||
assertNotNull(raceToSelect);
|
||||
raceColumnTable.selectEntry(raceToSelect);
|
||||
|
||||
TrackedRacesListPO trackedRaces = smartphoneTrackingPanel.getTrackedRaceListComposite();
|
||||
List<DataEntryPO> seleceted = trackedRaces.getTrackedRacesTable().getSelectedEntries();
|
||||
assertEquals(seleceted.size(),1);
|
||||
assertEquals(this.trackedRaces.get(1).race, seleceted.get(0).getColumnContent("Race"));
|
||||
}
|
||||
|
||||
private void configureLeaderboard() {
|
||||
|
||||
Reference in new issue
Block a user