Axel Uhl
abdae7e871
tricky Merge branch 'master' into otracelog; some of the otracelog changes had selectively been applied to master; need to check branch validity first
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.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/data/OnlineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/clients/LoadClient.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-09-17 17:57:38 +02:00
fmittag
5ab7d5af96
unified usage of "require-bundle: org.junit4" for all test bundles
2013-09-02 11:47:06 +02:00
Axel Uhl
8721038677
refactored OT framework such that null may represent a no-op
2013-07-11 09:17:26 +02:00
Armin Zamani
b501d1ca6f
Merge branch 'racecommittee_integrated' of
...
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Jens Rommel
08429d5a92
Turn test bundles to fragments.
...
- Builds with maven, except know local issue with selenium tests on my machine (due to Selenium/Firefox version mismatch)
- domain.test not suitable for a test fragment, since it contains larger parts of integration-tests using many different down-stream bundles.
2013-01-21 15:58:13 +01:00
D049941
c393031c41
Merge branch 'master' into 'gwt25'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java
2012-11-22 15:43:03 +01:00
fmittag
7a7c394cac
added missing .gitignore files in com.sap.sailing.operationaltransformation bundles
2012-05-03 13:54:30 +02:00
Axel Uhl
ff23e68c9f
added a second OT test which folds a leaderboard column addition with a leaderboard removal
2012-03-28 15:42:33 +02:00
Axel Uhl
b06c971b51
moved logic for leaderboard column handling to RacingEventService to prepare for a first OT test case
2012-03-28 12:00:23 +02:00
Axel Uhl
8a95d23f81
removed S return type from StatesAndOperations.apply, trying to avoid passing huge state objects around
2012-03-28 09:52:07 +02:00
Axel Uhl
8850b6cab8
renamed test case class so maven can find it
2012-03-26 23:11:38 +02:00
Axel Uhl
1a42433181
renamed OperationTransformationTests to OperationTransformationTest to let maven find it
2012-03-26 22:11:12 +02:00
Axel Uhl
078b7d520f
added operational transformation stuff to pom.xml hierarchy for central build
2012-03-26 21:20:30 +02:00
Axel Uhl
f956c869c5
spun off test bundle for operationaltransformation tests
2012-03-26 20:55:36 +02:00
Axel Uhl
fmittag
Armin Zamani
Jens Rommel
D049941