Commit Graph
516 Commits
Author SHA1 Message Date
Axel Uhl 360f72a6a7 Merge branch 'master' into bug2822_boatcolors 2018-03-24 08:49:11 +01:00
Axel Uhl bd90f921dd added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule 2018-03-24 01:45:37 +01:00
EC2 Server 626a3eeb95 Merge branch 'master' into bug2822_boatcolors 2018-03-09 15:50:45 +00:00
Frank Mittag 5de4d8367b fixed prefiltering of competitors for regattas with changing boats for the CompetitorRegistrationDialog 2018-03-06 16:40:14 +01:00
Axel Uhl ac309e52a0 fixed test case after TracTrac adjusted historic Bundesliga metadata
Change-Id: Ife54f3d2ac7dbe449af7d504dfcd86ded1a0adc1
2018-03-06 16:29:23 +01:00
Frank Mittag 9ad514909f Further test cleanup 2018-01-11 15:48:41 +01:00
Frank Mittag e629372c5a Cleanup of some test and removal of a createCompetitorAndBoat method() in AbstractLeaderboardTest 2018-01-11 14:39:32 +01:00
Axel Uhl 86f1236e97 create a dedicated test regatta with canBoatsOfCompetitorsChangePerRace==true, fixing test for bug2822
Change-Id: Iaf91ea326ae62525345c4709b2e85f42321c6afc
2017-12-29 17:05:33 +01:00
Axel Uhl a8d8e3aa94 fixed test (expected vs. actual); improved javadocs 2017-12-28 22:11:09 +01:00
Axel Uhl 0451fab1d2 Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: Id8ebf0c05a7a269c2f98342af1f43970127532ab
2017-12-25 12:52:32 +01:00
Axel Uhl 9b0773b36a use Competitor instead of their ID in RaceDefinition's Competitor-Boat map
Change-Id: I09df42c3ffa97434791c94a8da88523061ce5cea
2017-12-22 14:02:58 +01:00
Frank Mittag e75339039a Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes 2017-12-04 14:44:54 +01:00
Frank Mittag 812fef2f22 Removed not needed RegattaLogRegisterAndBoatEvent after discussion with Axel.
All registration on regatta level will be of type RegattaLogRegisterCompetitorEvent where the passed competitor is either of type Competitor or CompetitorWithBoat depending on the regatta type
2017-12-04 14:38:59 +01:00
Axel Uhl 2e07176410 added failing test case for bug 4387
Change-Id: I5059f3cc94db585fa3a5da64ac50a285b13a1e6f
2017-12-03 15:22:14 +01:00
Frank Mittag c5be235354 added a boat replication test 2017-11-24 15:09:40 +01:00
Frank Mittag d45de24610 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Frank Mittag 7517a9a26c fixed a couple of tests after removal of BoatStore.getOrCreateBoat(competitor) 2017-11-16 11:05:07 +01:00
Frank Mittag 819118c73c fixed a broken test in RegattaReplicationTest 2017-11-13 13:13:17 +01:00
Papick Garcia Taboada fb8d346213 Removed getRegattas() 2017-09-21 16:34:35 +02:00
Axel Uhl 380cd27572 introduced a CreateCompetitor operation, adjusted test; should fix bug4291
Change-Id: I4c2e040e36884eb2e31f7dbb803dde67a52c9701
2017-09-15 15:23:07 +02:00
Axel Uhl be95b42071 sort of a failing test case for bug4291, although there is no obvious way for correct, replicable competitor creation (part of the problem)
Change-Id: Ia5be3c6b3a64754f4829437101b25628c505107c
2017-09-15 14:21:54 +02:00
Frank Mittag ecc51c05ba Removed the idea of a RegattaLogEntryEvent
Refactored CompetitorProviderFromRaceColumnsAndRegattaLike to be a CompetitorAndBoatProviderFromRaceColumnsAndRegattaLike to cache also the boats of the competitors
2017-08-30 17:01:01 +02:00
Frank Mittag 68ae4f561c Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
#	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-08-28 16:12:00 +02:00
Frank Mittag 48162c73be major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it. 2017-08-25 17:09:00 +02:00
Steffen Schaefer 2603294510 Bug 2059: Statistics calculation is now cached per TrackedRace 2017-07-11 16:56:36 +02:00
Frank Mittag 69ea00be97 fixed inconsistent name and parameter type of method TrackedRace.getBoatOfCompetitor(Serializable competitorId) to be
TrackedRace.getBoatOfCompetitor(Competitor competitor)
2017-06-22 13:41:41 +02:00
Steffen Schäfer 1542a36109 Merge branch 'master' into bug2822_boatcolors 2017-05-16 16:12:16 +02:00
Steffen Schäfer 67d310df4b Merge branch 'master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
#	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Steffen Schaefer 9123771f34 normalized line endings 2017-05-16 09:42:02 +02:00
Frank Mittag fd8fee5d58 work commit in the middle of refactoring competitor.getBoat() 2017-04-28 09:08:14 +02:00
Axel Uhl b11dca244e bug3552: refactored Mark.color from String to Color
Change-Id: Iddcc26de68dd5c1ecd3fdcbb61e59810e879ae37
2017-04-11 11:20:46 +02:00
Frank Mittag 358b733fd6 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2017-03-30 18:05:51 +02:00
Axel Uhl cfccd8c5d6 Merge remote-tracking branch 'origin/tracapi-3.6.0' 2017-03-08 21:35:31 +01:00
Frank Mittag 31e8164166 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh_CN.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java
2017-03-08 16:03:56 -03:00
Axel Uhl a4b5bfe8d5 use timeout mechanism of TracAPI 3.6.0 for obtaining IRace from TracTrac
Change-Id: Ib3ceca870482ce524f647f7c985320c470086a95
2017-03-08 12:17:49 +01:00
Axel Uhl 735b9a8042 relaxed further test verdicts; fixed WindTrackImpl.remove regarding equals and compactify
Change-Id: Iba121c395fb35963df0c6f0a699f4d27f818b723
2017-03-07 20:42:03 +01:00
Axel Uhl 688d37d27c bug 4037: automatically "upgrade" to replay format during restore if available;
still using a kludge for detecting replay format; TracAPI 3.3.2 will
offer a reliable API for that later today

Change-Id: Ied19e1e787f6f28d2a6e531b9ac1aedf5721ab5b
2017-01-25 08:47:17 +01:00
Steffen Schaefer 673907c017 Merge branch 'master' into bug2447
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/pom.xml
2017-01-09 10:05:05 +01:00
fmittag fbd07215d3 added some simple load/store and replication tests for new 'canBoatsOfCompetitorsChangePerRace' attribute of regatta 2017-01-03 13:05:35 +01:00
fmittag 45452ac185 added canBoatsOfCompetitorsChangePerRace attribute to regatta (+corresponding load/store methods and admin UI) 2016-12-30 17:05:03 +01:00
Axel Uhl f9b4ac7b50 passing through trackWind and correctByDeclination params into connectivity params
Change-Id: I7adbb4f2c84e5352c9f3891b23198b74ca2fce4c
2016-12-30 12:02:06 +01:00
Axel Uhl 704e4e2a64 refactored RaceTracker such that getRace[Identifier]s() is now getRace[Identifier](), alluding to the always-singular aspect of RaceTracker/RaceHandle
Change-Id: I50d202122c3021dd2f852762688d762fb3806d99
2016-12-29 18:10:36 +01:00
Axel Uhl 19d112115b first working version of tracked race restoring with -Drestore.tracked.races=true;
Change-Id: I2c3968d772c7382589ada66c60874015f46f8996
2016-12-29 17:18:42 +01:00
fmittag 474295d281 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
2016-12-29 14:03:06 +01:00
Axel Uhl 7126902cf2 adding set of replicables or their IDs to master and replica descriptors and passing through to ReplicationServlet
Change-Id: I51a70718d94b161e747f2a887028fdeeb996f21a
2016-12-22 14:32:47 +01:00
Steffen Schaefer dd5d1fc745 Using junit and hamcrest from orbit / adjustments for different junit
bundle ID
2016-11-24 13:29:02 +01:00
fmittag 23340a0337 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2016-11-10 19:17:24 +01:00
Axel Uhl be4691d616 more renames
Change-Id: I4f5e55eafc100871c186f1c1ce43892c9fae6cfd
2016-10-13 17:09:52 +02:00
fmittag 00f7abc7c4 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
2016-10-04 16:48:30 +02:00
Alexander Tatarinovich c72a9923df bug 1564 : Rename variables and refactoring
Change-Id: Icdb792cf2a863fe4874841114a5f4cb05b25847d
2016-09-27 16:07:00 +03:00