Commit Graph
638 Commits
Author SHA1 Message Date
Axel Uhl 9c299f0718 Merge branch 'master' into bug4469 2019-01-15 20:24:46 +01:00
Axel Uhl 496ea9f278 enforce creation of new Subject; added Subject-related tests
Change-Id: Ie126133d7ee25b452cefd6c15ca3225c7aae656b
2019-01-14 17:46:30 +01:00
Axel Uhl 6883cb9087 added logging output in TaggingServiceTest showing the threads executing the critical methods
Change-Id: I7d90a2031c963983a5adce0e865990e71f0cf159
2019-01-14 09:44:03 +01:00
Axel Uhl fd0cc2e388 added synchronization to avoid possible threading issues in JUnit execution order
Change-Id: I5e0b3fdcab8bf0349e25149a79557e5b8cc60a4f
2019-01-14 09:32:57 +01:00
Axel Uhl c1970b38c3 trying to work with ThreadState.bind() / .restore() symmetrically in TaggingServiceTest
Change-Id: I745b31b1fcbb229f280fb35635595641089f2da0
2019-01-11 18:34:09 +01:00
Axel Uhl a3c39e97f7 attach subject to thread state in TaggingServiceTest 2019-01-10 00:58:19 +01:00
Robin Kuck ab27f9f155 Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2019-01-05 14:30:00 +01:00
Axel Uhl c8897dfb40 fixed SearchServiceTest, ensuring the Shiro thread state is bound
Change-Id: I093bab634260af7a25981ed987ce163a9fda73d7
2019-01-04 15:47:09 +01:00
Axel Uhl 72bc50fc0d move RacingEventService into a separate com.sap.sailing.server.interface bundle
Change-Id: Ib75bf6a46be9eaf2d9ccfad85832a3be8a7686be
2018-12-14 23:56:24 +01:00
Axel Uhl 736c47d03a fixed test failing due to a ClassCastException
Change-Id: I58257578052c90bfe3403b917b588f76b94ad163
2018-12-11 17:04:11 +01:00
Axel Uhl 9a08f9c9e9 fixed various DB handling after Mongo 3.x upgrade; made *.security.replication.test an eclipse-test-plugin
Change-Id: Ibbe80a15b6adce78c457a81009d387dbd74d9186
2018-12-11 12:56:50 +01:00
Axel Uhl 914be75f91 warning-free workspace after upgrading to MongoDB 3.x APIs, eliminating deprecation issues
Change-Id: I9773b899e140871f5fa4b865ca6d2116bf73c642
2018-12-10 23:22:20 +01:00
Axel Uhl 4dd9f10e2c removed further deprecations by switching imports from junit.* to org.junit 2018-12-10 03:46:28 +01:00
Robin Kuck 21d9a1261c Merge remote-tracking branch 'origin/master' into bug4469 2018-11-06 20:42:15 +01:00
Axel Uhl bae28e950b fixed encoding
Change-Id: If0c068f69534e7a14354d2e37672ea3df89f713b
2018-10-11 18:09:58 +02:00
Axel Uhl 4f126f4710 create temporary UserStoreImpl to trigger bundle loading in OSGi test environment
Change-Id: I44d47a8c96a0b19fdb14884feb30679efbbd609a
2018-10-11 17:49:29 +02:00
Axel Uhl 230a5a4c1c fixed typo in comment; added logging
Change-Id: Ic4308772f659d80617509c68c5f5781b8bead657
2018-10-11 13:43:59 +02:00
D067890 e5d35e0397 Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into
bug4104

Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TagDTODeSerializer.java
2018-10-01 10:59:00 +02:00
Henri Kohlberg 4e58a37592 Bug 4104: Added timeout for SecurityService in JUnit test. Just for testing purposes, should not be used in production! 2018-09-28 13:00:52 +02:00
Henri Kohlberg 8c145ef3bd Bug 4104: Use service tracker also for JUnit tests in OSGi environment. 2018-09-28 11:18:22 +02:00
Henri Kohlberg cc59efcf49 Bug 4104: Adapted TaggingService and TaggingServiceTest to check their environment whether it is OSGi enabled or not and get security service from correct source (service tracker in OSGi, static reference of Activator in non-OSGi) 2018-09-28 08:28:34 +02:00
Henri Kohlberg e0249a7f64 Bug 4104: Try to fix problem with multplie userstores during hudson build (works locally) 2018-09-27 11:46:22 +02:00
Henri Kohlberg c50dbd1aa7 Bug 4104: Added tests for TagDTODeSerializer, changed output of timepoint serialization in case given timepoint is null to prevent NullPointerException and replaced toString() on JSON objects by getJSONString(). 2018-09-27 11:38:46 +02:00
D067890 f20fbcb38e Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into
bug4104

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.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/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFooterPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagModificationPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPanelResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TagDTODeSerializer.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
2018-09-27 10:12:28 +02:00
Henri Kohlberg 764e8b660f Bug 4104: Drop PREFERENCES-collection when resetting environment for next unit test. 2018-09-27 09:58:59 +02:00
Henri Kohlberg 679e175a3b Bug 4104: Adapted unit test for TaggingService with more detailed log messages to identify failing tests. 2018-09-27 09:50:53 +02:00
Henri Kohlberg 0dd4cd75b5 Bug 4104: Added first version of unit tests for tagging backend functionality. 2018-09-26 14:57:41 +02:00
Joshua Schulz c47625fdff Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
	java/com.sap.sse.security.ui/Security UI sdm.launch
	java/com.sap.sse.security.ui/Security UI.launch
2018-08-20 10:08:56 +02:00
Kai Börnert 95d71cdb9f bug4661 formating/code style only change 2018-07-17 09:16:03 +02:00
Kai Börnert 879c0c3504 move score factor calculation to ScoringScheme if not explizitly set 2018-07-13 14:38:06 +02:00
Robin Kuck a27c8b725a Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/pairinglist/PairingListEntryPoint.java
2018-07-02 21:20:23 +02:00
Kai Börnert 57067b2d37 bug4343 added test for encoding of leaderboards, improved leaderboard
encoding to capture all cases
2018-06-20 11:42:29 +02:00
Robin Kuck 753897a917 Merge remote-tracking branch 'origin/master' into bug4469 2018-06-12 23:54:28 +02:00
Robin Kuck 97d6eb4655 Merge remote-tracking branch 'origin/master' into bug4469 2018-05-29 22:34:52 +02:00
Maximilian Groß 37917a50a4 Merge branch 'master' into bug4491
# Conflicts:
#	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
#	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.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/client/StringMessages_de.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
#	java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
2018-05-28 08:35:21 +02:00
Axel Uhl b98b4efa78 Merge branch 'bug4574' into bug4527 2018-05-15 01:48:21 +02:00
Axel Uhl 80c3ce45bd fixed test case after getOrCreateCompetitorWithBoat got stricter 2018-05-15 01:44:38 +02:00
Axel Uhl b095a063a8 bug 4527: allow for synchronous RaceListener registrations
Change-Id: Ibb6a064222d9cb1ef0944df5fee9dd0e3675ab8e
2018-05-14 15:36:04 +02:00
Robin Kuck 28523ce624 Merge remote-tracking branch 'origin/master' into bug4469
# Conflicts:
#	java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
2018-04-30 11:56:24 +02:00
Maximilian Groß e977678869 Merge branch 'master' into bug4491
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
#	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/LeaderboardsResource.java
2018-04-20 13:10:37 +02:00
Axel Uhl 22b4ec6535 Merge branch 'master' into bug4509
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
2018-04-13 15:55:28 +02:00
Axel Uhl b4f1c8fb10 more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Axel Uhl 662fd99fad Merge branch 'master' into bug4509
Change-Id: I68eacba973b9c1246aaf9b769f69bc7e96e93f2b
2018-04-12 14:23:56 +02:00
Axel Uhl 4c319f5f6c renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Axel Uhl 231e83bc2c Merge branch 'master' into bug4509
Change-Id: I23ff6e0b645ab626284fc95b172243878e022806
2018-04-12 13:41:37 +02:00
Maximilian Groß ed1fae0c8f divided datamining from sailing specific classes 2018-04-12 07:40:59 +02:00
Axel Uhl 1cf923a027 use DynamicCompetitor and DynamicBoat where necessary
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Steffen Schaefer 16ada7f8a6 Bug 4492: Adjusted StatisticsTest to correctly work with asynchronous
event handling
2018-04-11 10:15:10 +02:00
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