eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-26 23:46:36 +00:00
Code Activity

Refactored host name

Browse Source
This commit is contained in:
Lennart Hensler
2012-01-20 09:56:55 +01:00
parent de4b65f0cc
commit 94a9bea66a
11 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
+4 -3
View File
@@ -19,6 +19,7 @@ import org.junit.Before;
import com.maptrack.client.io.TypeController;
import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.tractrac.clientmodule.util.Base64;
import com.tractrac.clientmodule.Event;
import com.tractrac.clientmodule.data.DataController;
@@ -54,9 +55,9 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest impl
*/
@Before
public void setUp() throws MalformedURLException, IOException, InterruptedException, URISyntaxException {
setUp(new URL("http://germanmaster.traclive.dk/events/event_20110505_SailingTea/clientparams.php?event=event_20110505_SailingTea&race=bd8c778e-7c65-11e0-8236-406186cbf87c"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4412") : new URI("tcp://germanmaster.traclive.dk:4400"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://germanmaster.traclive.dk:4401"));
setUp(new URL("http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110505_SailingTea/clientparams.php?event=event_20110505_SailingTea&race=bd8c778e-7c65-11e0-8236-406186cbf87c"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4412") : new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401"));
}
protected void setUp(URL paramUrl, URI liveUri, URI storedUri) throws FileNotFoundException, MalformedURLException {
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInEventTest.java
+4 -3
View File
@@ -17,6 +17,7 @@ import org.junit.Test;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.domain.tractracadapter.TracTracRaceTracker;
import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl;
@@ -36,9 +37,9 @@ public class MultipleClassesInEventTest {
@Test
public void testLoadTwoRacesWithEqualEventNameButDifferentClasses() throws MalformedURLException, FileNotFoundException, URISyntaxException {
String httpAndHost = "http://germanmaster.traclive.dk";
String liveURI = "tcp://germanmaster.traclive.dk:4400";
String storedURI = "tcp://germanmaster.traclive.dk:4401";
String httpAndHost = "http://" + TracTracConnectionConstants.HOST_NAME;
String liveURI = "tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400";
String storedURI = "tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401";
if (tractracTunnel) {
liveURI = "tcp://"+tractracTunnelHost+":4412";
storedURI = "tcp://"+tractracTunnelHost+":4413";
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
+4 -3
View File
@@ -35,6 +35,7 @@ import com.sap.sailing.domain.tracking.impl.GPSFixImpl;
import com.sap.sailing.domain.tracking.impl.TrackedLegImpl;
import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl;
import com.tractrac.clientmodule.Race;
@@ -124,9 +125,9 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest {
protected void setUpWithoutLaunchingController(String eventName, String raceId) throws FileNotFoundException, MalformedURLException,
URISyntaxException {
super.setUp(new URL("http://germanmaster.traclive.dk/events/"+eventName+"/clientparams.php?event="+eventName+"&race="+raceId),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4412") : new URI("tcp://germanmaster.traclive.dk:4400"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://germanmaster.traclive.dk:4401"));
super.setUp(new URL("http://" + TracTracConnectionConstants.HOST_NAME + "/events/"+eventName+"/clientparams.php?event="+eventName+"&race="+raceId),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4412") : new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401"));
if (domainFactory == null) {
domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl());
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ParseTracTracJSONServiceOutputTest.java
+6 -5
View File
@@ -23,6 +23,7 @@ import org.junit.Test;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.JSONService;
import com.sap.sailing.domain.tractracadapter.RaceRecord;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
public class ParseTracTracJSONServiceOutputTest {
@Test
@@ -73,7 +74,7 @@ public class ParseTracTracJSONServiceOutputTest {
@Test
public void testWeymouthOnline() throws MalformedURLException, IOException, java.text.ParseException, ParseException, URISyntaxException {
JSONService jsonService = DomainFactory.INSTANCE.parseJSONURL(new URL(
"http://germanmaster.traclive.dk/events/event_20110505_SailingTea/jsonservice.php"));
"http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110505_SailingTea/jsonservice.php"));
assertEquals("Sailing Team Germany", jsonService.getEventName());
List<RaceRecord> races = jsonService.getRaceRecords();
assertTrue(races.size()>=28);
@@ -90,19 +91,19 @@ public class ParseTracTracJSONServiceOutputTest {
@Test
public void testWeymouthURIsOnline() throws MalformedURLException, IOException, java.text.ParseException, ParseException, URISyntaxException {
JSONService jsonService = DomainFactory.INSTANCE.parseJSONURL(new URL(
"http://germanmaster.traclive.dk/events/event_20110505_SailingTea/jsonservice.php"));
"http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110505_SailingTea/jsonservice.php"));
List<RaceRecord> races = jsonService.getRaceRecords();
assertFalse(races.isEmpty());
for (RaceRecord race : races) {
assertEquals(new URI("tcp://germanmaster.traclive.dk:4400"), race.getLiveURI());
assertEquals(new URI("tcp://germanmaster.traclive.dk:4401"), race.getStoredURI());
assertEquals(new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400"), race.getLiveURI());
assertEquals(new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401"), race.getStoredURI());
}
}
@Test
public void testHamiltonOnline() throws MalformedURLException, IOException, java.text.ParseException, ParseException, URISyntaxException {
JSONService jsonService = DomainFactory.INSTANCE.parseJSONURL(new URL(
"http://germanmaster.traclive.dk/events/event_20110308_SAPWorldCh/jsonservice.php"));
"http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110308_SAPWorldCh/jsonservice.php"));
assertEquals("SAP 2011 505 World Championship", jsonService.getEventName());
List<RaceRecord> races = jsonService.getRaceRecords();
assertEquals(14, races.size());
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java
+5 -4
View File
@@ -16,6 +16,7 @@ import org.junit.Test;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.domain.tractracadapter.TracTracRaceTracker;
import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl;
@@ -41,9 +42,9 @@ public class UnicodeCharactersInCompetitorNamesTest {
TracTracRaceTracker fourtyninerYellow_2 = domainFactory
.createRaceTracker(
new URL(
"http://germanmaster.traclive.dk/events/event_20110609_KielerWoch/clientparams.php?event=event_20110609_KielerWoch&race=5b08a9ee-9933-11e0-85be-406186cbf87c"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4412") : new URI("tcp://germanmaster.traclive.dk:4400"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://germanmaster.traclive.dk:4401"),
"http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110609_KielerWoch/clientparams.php?event=event_20110609_KielerWoch&race=5b08a9ee-9933-11e0-85be-406186cbf87c"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4412") : new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401"),
EmptyWindStore.INSTANCE, new DummyTrackedEventRegistry());
Iterable<Competitor> competitors = fourtyninerYellow_2.getRacesHandle().getRaces().iterator().next().getCompetitors();
@@ -62,7 +63,7 @@ public class UnicodeCharactersInCompetitorNamesTest {
BufferedReader localBufferedReader = new BufferedReader(
new InputStreamReader(
new URL(
"http://germanmaster.traclive.dk/events/event_20110609_KielerWoch/clientparams.php?event=event_20110609_KielerWoch&race=5b08a9ee-9933-11e0-85be-406186cbf87c")
"http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110609_KielerWoch/clientparams.php?event=event_20110609_KielerWoch&race=5b08a9ee-9933-11e0-85be-406186cbf87c")
.openStream(), charsetname));
String line;
while ((line=localBufferedReader.readLine()) != null) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/TracTracConnectionConstants.java → java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracConnectionConstants.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.gwt.ui.server;
package com.sap.sailing.domain.tractracadapter;
public interface TracTracConnectionConstants {
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -10,7 +10,8 @@ Require-Bundle: com.sap.sailing.gwt.ui,
com.sap.sailing.server,
com.google.gwt.osgi;bundle-version="2.4.0",
com.sap.sailing.server.api,
com.sap.sailing.domain.common
com.sap.sailing.domain.common,
com.sap.sailing.domain.tractracadapter
Bundle-ClassPath: .
Import-Package: javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
+4 -3
View File
@@ -9,6 +9,7 @@ import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.leaderboard.ExpandableSortableColumn;
import com.sap.sailing.gwt.ui.shared.LeaderboardDTO;
@@ -29,7 +30,7 @@ public class GwtTestCaseColumnToggling extends GWTTestCase {
private final String EVENT_NAME = "Sailing Team Germany (STG)";
protected static final boolean tractracTunnel = true; // Boolean.valueOf(System.getProperty("tractrac.tunnel", "false"));
protected static final String tractracTunnelHost = "10.18.10.38"; // System.getProperty("tractrac.tunnel.host", "localhost");
private final String JSON_URL= "http://germanmaster.traclive.dk/events/event_20110505_SailingTea/jsonservice.php";
private final String JSON_URL= "http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110505_SailingTea/jsonservice.php";
private final String TRACKED_RACE = "schwerttest";
@@ -77,8 +78,8 @@ public class GwtTestCaseColumnToggling extends GWTTestCase {
}
private void trackRace(){
service.track(rrDao, tractracTunnel ? "tcp://"+tractracTunnelHost+":4412" : "tcp://germanmaster.traclive.dk:4400",
tractracTunnel ? "tcp://"+tractracTunnelHost+":4413" : "tcp://germanmaster.traclive.dk:4401", false, false, new AsyncCallback<Void>() {
service.track(rrDao, tractracTunnel ? "tcp://"+tractracTunnelHost+":4412" : "tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400",
tractracTunnel ? "tcp://"+tractracTunnelHost+":4413" : "tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401", false, false, new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java
+2 -1
View File
@@ -35,6 +35,7 @@ import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.view.client.MultiSelectionModel;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.EventRefresher;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
@@ -133,7 +134,7 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
grid.setWidget(3, 0, lblHostname);
hostnameTextbox = new TextBox();
hostnameTextbox.setText("germanmaster.traclive.dk");
hostnameTextbox.setText(TracTracConnectionConstants.HOST_NAME);
hostnameTextbox.addKeyUpHandler(new KeyUpHandler() {
@Override
public void onKeyUp(KeyUpEvent event) {
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java
+4 -3
View File
@@ -23,6 +23,7 @@ import com.sap.sailing.domain.tracking.RacesHandle;
import com.sap.sailing.domain.tracking.TrackedEvent;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.server.impl.RacingEventServiceImpl;
public class RaceTrackerTest {
@@ -40,15 +41,15 @@ public class RaceTrackerTest {
// liveUri = new URI("tcp://sapsimulation.tracdev.dk:4420"); // or with tunneling: tcp://localhost:4420
// storedUri = new URI("tcp://sapsimulation.tracdev.dk:4421"); // or with tunneling: tcp://localhost:4421
// for stored race, non-real-time simulation:
paramUrl = new URL("http://germanmaster.traclive.dk/events/event_20110505_SailingTea/clientparams.php?event=event_20110505_SailingTea&race=bd8c778e-7c65-11e0-8236-406186cbf87c");
paramUrl = new URL("http://" + TracTracConnectionConstants.HOST_NAME + "/events/event_20110505_SailingTea/clientparams.php?event=event_20110505_SailingTea&race=bd8c778e-7c65-11e0-8236-406186cbf87c");
if (tractracTunnel) {
liveUri = new URI("tcp://"+tractracTunnelHost+":4412");
storedUri = new URI("tcp://"+tractracTunnelHost+":4413");
} else {
// no tunnel:
liveUri = new URI("tcp://germanmaster.traclive.dk:4400");
storedUri = new URI("tcp://germanmaster.traclive.dk:4401");
liveUri = new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400");
storedUri = new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401");
}
}
java/com.tractrac.resultapi/src/com/tractrac/ResultAPITester.java
+2
View File
@@ -47,6 +47,8 @@ public class ResultAPITester {
int speedup = 40;
// Instance the resultgenerator using a URL for a specific race
//Hardcoded host name 'germanmaster.traclive.dk' necessary, because an import of TracTracConnectionConstants causes a dependencies cycly
//For the reasen that this code is nearly never used the effort of a bigger refactoring is saved
ResultGenerator generator = new ResultGenerator(new URL("http://germanmaster.traclive.dk/events/event_20110308_SAPWorldCh/clientparams.php?event=event_20110308_SAPWorldCh&race=5ffe619e-4962-11e0-8236-406186cbf87c&ci=&minimize=&LiveDelaySecs="));
// Start out not using custom wind