Peter Siegmund
|
8ff5aea866
|
Merge branch 'ubilabs--rcapp--new-testing'
|
2015-06-19 13:18:34 +02:00 |
|
Peter Siegmund
|
d6f5264e16
|
Merge branch 'ubilabs--rcapp--new-testing' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--new-testing
|
2015-06-19 13:18:06 +02:00 |
|
Peter Siegmund
|
f72208dd6d
|
Added JUnit tests for Android into build script (rcapp only yet)
|
2015-06-19 13:17:57 +02:00 |
|
Axel Uhl
|
6112b16b26
|
checked in launch configuration for RCApp unit tests
|
2015-06-19 13:11:20 +02:00 |
|
Axel Uhl
|
3b5de63375
|
construct managed race identifier in test case using ManagedRaceIdentifierImpl
|
2015-06-19 13:09:10 +02:00 |
|
Peter Siegmund
|
9410b6b557
|
added missing escape sequence
|
2015-06-19 12:37:30 +02:00 |
|
Peter Siegmund
|
78817ac60a
|
added JVM/Junit testing to RCApp (and renamed the UI test folder)
|
2015-06-19 12:08:48 +02:00 |
|
Simon Pamies
|
29518d63a4
|
Merge remote-tracking branch 'origin/ribdashboard'
|
2015-06-19 10:20:33 +01:00 |
|
Peter Siegmund
|
c2cce35d7c
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-06-19 11:02:27 +02:00 |
|
Axel Uhl
|
39c738a66f
|
Merge branch 'ubilabs--rcapp--hotfix-master'
|
2015-06-19 10:56:02 +02:00 |
|
Axel Uhl
|
a422fc0ddf
|
added Javadoc
|
2015-06-19 10:55:44 +02:00 |
|
Peter Siegmund
|
9b495f9d09
|
fix for RaceStateService
|
2015-06-19 10:22:11 +02:00 |
|
fmittag
|
8a01c1d15e
|
Merge remote-tracking branch 'origin/ORC-icons'
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java
|
2015-06-19 10:15:00 +02:00 |
|
Peter Siegmund
|
4337655aaf
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-06-19 08:36:31 +02:00 |
|
Axel Uhl
|
c76eb1f74e
|
Merge branch 'master' into ribdashboard
|
2015-06-19 02:06:30 +02:00 |
|
Axel Uhl
|
6ef7ca5e53
|
Merge branch 'jbross-dependent-race-start'
|
2015-06-19 02:02:32 +02:00 |
|
Axel Uhl
|
a7a52fbee8
|
re-consolidating ORC icon stuff into BoatClassMasterdata for now; major refactoring would be required otherwise
|
2015-06-19 01:56:10 +02:00 |
|
Axel Uhl
|
f20f915f8c
|
Merge remote-tracking branch 'server/master' with strategy "ours", eliminating bdfb763037270e509cb13ba75ebe3b6d5c1b76ca;
Commit bdfb763037 is now on branch ORC-icons, and I have major concerns
with its implementation.
|
2015-06-19 01:30:03 +02:00 |
|
Axel Uhl
|
fe2a45ddf7
|
use default implementation for TrackedRace.takesWindFix, avoiding new overrides in test mocks
|
2015-06-19 00:55:04 +02:00 |
|
Axel Uhl
|
ba66852b7f
|
added several test cases for the different constellations of TrackedRace.takesWindFix
|
2015-06-19 00:47:43 +02:00 |
|
Axel Uhl
|
e7604d2eab
|
fixed the implementation of TrackedRaceImpl.takesWindFix to let previously failing test case pass
|
2015-06-19 00:33:43 +02:00 |
|
fmittag
|
e0e08a23ab
|
Merge remote-tracking branch 'origin/master'
|
2015-06-19 00:21:36 +02:00 |
|
fmittag
|
bdfb763037
|
added some logic to resolve valid boat class icons also for ORC handicap races
|
2015-06-19 00:21:09 +02:00 |
|
Axel Uhl
|
dcd826dd91
|
fixed test case construction: use two differently-named leaderboard columns
|
2015-06-19 00:19:24 +02:00 |
|
Axel Uhl
|
03c89e4b7c
|
fixed typo on string constant
|
2015-06-19 00:06:02 +02:00 |
|
Axel Uhl
|
71432db23f
|
removed redundant else / if clause
|
2015-06-18 23:54:07 +02:00 |
|
Axel Uhl
|
87a9dce9dc
|
fixed calculation of latestEndTimePoint in TrackedRaceImpl.takesWindFix and made variables final where possible
|
2015-06-18 23:52:24 +02:00 |
|
Axel Uhl
|
c58cd9ae21
|
added failing test case for takesWindFix
|
2015-06-18 23:51:05 +02:00 |
|
Axel Uhl
|
909978f345
|
code formatting
|
2015-06-18 23:39:38 +02:00 |
|
Axel Uhl
|
b53c5ac5ad
|
method rename and Javadoc
|
2015-06-18 23:24:42 +02:00 |
|
Axel Uhl
|
99c02aac2c
|
fixed indentation
|
2015-06-18 23:14:37 +02:00 |
|
Axel Uhl
|
92191ea00e
|
organized import to avoid warning
|
2015-06-18 22:54:00 +02:00 |
|
Axel Uhl
|
85a0e95f0a
|
Merge branch 'master' into ribdashboard
|
2015-06-18 22:51:57 +02:00 |
|
Axel Uhl
|
770e23e578
|
Merge branch 'master' into jbross-dependent-race-start
|
2015-06-18 22:38:44 +02:00 |
|
Axel Uhl
|
a6e0abdc9f
|
Merge branch 'bug2970'
|
2015-06-18 22:30:50 +02:00 |
|
Axel Uhl
|
eb79a79baa
|
fixed translation texts in RCApp
|
2015-06-18 20:01:08 +02:00 |
|
fmittag
|
80404211bf
|
Merge remote-tracking branch 'origin/master'
|
2015-06-18 16:25:59 +02:00 |
|
Axel Uhl
|
e8f622487f
|
fixed Selenium test case: the problem was that the substitution of '/' by '_' in default regatta names missed the test's expectation
|
2015-06-18 16:24:45 +02:00 |
|
Alexander Ries
|
ea599be9d1
|
testReplicationOfLoadingOfStoredWindTrack test is green again, after adding a starttimereceived to the trackedrace used and adding similar timepoints to test wind
|
2015-06-18 16:15:45 +02:00 |
|
fmittag
|
674728080d
|
added RS800 boat class and boat class image
|
2015-06-18 16:04:34 +02:00 |
|
Axel Uhl
|
9c319315a7
|
Merge branch 'master' into bug2970
|
2015-06-18 15:56:48 +02:00 |
|
Axel Uhl
|
86c156f7a9
|
Merge branch 'master' into jbross-dependent-race-start
|
2015-06-18 15:55:14 +02:00 |
|
Axel Uhl
|
bab6a51fc7
|
Merge remote-tracking branch 'server/master'
|
2015-06-18 15:54:35 +02:00 |
|
Axel Uhl
|
1ca11a4504
|
fixed post-merge issues, mostly changing race ID from Serializable to String in RCApp
|
2015-06-18 15:52:52 +02:00 |
|
Steffen Tobias Wagner
|
73b359b82c
|
fixed spelling
|
2015-06-18 12:05:15 +00:00 |
|
Axel Uhl
|
d7c053314b
|
fixed merge problem to make compilable again
|
2015-06-18 13:47:03 +02:00 |
|
Alexander Ries
|
6e319adb9e
|
fixed testWindAdditionReplication by adding startOfTrackingReceived to local trackedrace used there
|
2015-06-18 13:46:59 +02:00 |
|
Axel Uhl
|
535654593c
|
Merge branch 'master' into jbross-dependent-race-start
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
|
2015-06-18 13:45:50 +02:00 |
|
Alexander Ries
|
7e33666c6c
|
Revert "set startOfTracking to now on local created trackedRace in TrackedRaceContentsReplicationTest"
This reverts commit cdc9301344.
|
2015-06-18 13:37:59 +02:00 |
|
fmittag
|
bbcea87fa4
|
one more improvement for the race list (time format)
|
2015-06-18 11:31:13 +02:00 |
|