eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-18 02:00:58 +00:00
Code Activity

Merge branch 'master' into tracapi

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.java
	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/AbstractReceiverWithQueue.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceStartedAndFinishedReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
This commit is contained in:
Axel Uhl committed 2014-06-03 01:47:08 +02:00
2 parents bda21b2464 1eed921f29
commit 7fb0dfcf99
591 files changed
+33276 -2927
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/.classpath
+1
View File
@@ -5,5 +5,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.3.jar"/>
<classpathentry kind="lib" path="/org.openqa.selenium.osgi/lib/commons-exec-1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -10,6 +10,7 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
org.openqa.selenium.osgi;bundle-version="2.40.0",
com.sap.sailing.mongodb;bundle-version="1.0.0",
com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.domain.common
com.sap.sailing.domain.common,
com.sap.sse.common
Bundle-ClassPath: lib/cglib-nodep-2.2.3.jar,
.
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboardedit/TestLeaderboardEditing.java
+1 -1
View File
@@ -6,7 +6,6 @@ import static org.junit.Assert.assertNotNull;
import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO;
@@ -20,6 +19,7 @@ import com.sap.sailing.selenium.pages.gwt.DataEntryPO;
import com.sap.sailing.selenium.pages.leaderboardedit.LeaderboardEditingPage;
import com.sap.sailing.selenium.pages.leaderboardedit.LeaderboardTable;
import com.sap.sailing.selenium.test.AbstractSeleniumTest;
import com.sap.sse.common.Util;
public class TestLeaderboardEditing extends AbstractSeleniumTest {
private static final String LEADERBOARD = "BMW Cup - J80";