also changed the ports for TracTrac tunneling to 1520/1521

This commit is contained in:
Axel Uhl committed 2012-01-19 17:41:09 +01:00
1 parent b660b6f864
commit 0f2c72921c
6 files changed
+12 -12

No files matched your search

@@ -55,8 +55,8 @@ 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:1520"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://germanmaster.traclive.dk:1521"));
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":1520") : new URI("tcp://germanmaster.traclive.dk:1520"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":1521") : new URI("tcp://germanmaster.traclive.dk:1521"));
}
protected void setUp(URL paramUrl, URI liveUri, URI storedUri) throws FileNotFoundException, MalformedURLException {
@@ -40,8 +40,8 @@ public class MultipleClassesInEventTest {
String liveURI = "tcp://germanmaster.traclive.dk:1520";
String storedURI = "tcp://germanmaster.traclive.dk:1521";
if (tractracTunnel) {
liveURI = "tcp://"+tractracTunnelHost+":4412";
storedURI = "tcp://"+tractracTunnelHost+":4413";
liveURI = "tcp://"+tractracTunnelHost+":1520";
storedURI = "tcp://"+tractracTunnelHost+":1521";
}
kiwotest1 = domainFactory
.createRaceTracker(
@@ -125,8 +125,8 @@ 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:1520"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://germanmaster.traclive.dk:1521"));
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":1520") : new URI("tcp://germanmaster.traclive.dk:1520"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":1521") : new URI("tcp://germanmaster.traclive.dk:1521"));
if (domainFactory == null) {
domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl());
}
@@ -42,8 +42,8 @@ public class UnicodeCharactersInCompetitorNamesTest {
.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:1520"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":4413") : new URI("tcp://germanmaster.traclive.dk:1521"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":1520") : new URI("tcp://germanmaster.traclive.dk:1520"),
tractracTunnel ? new URI("tcp://"+tractracTunnelHost+":1521") : new URI("tcp://germanmaster.traclive.dk:1521"),
EmptyWindStore.INSTANCE, new DummyTrackedEventRegistry());
Iterable<Competitor> competitors = fourtyninerYellow_2.getRacesHandle().getRaces().iterator().next().getCompetitors();
@@ -77,8 +77,8 @@ public class GwtTestCaseColumnToggling extends GWTTestCase {
}
private void trackRace(){
service.track(rrDao, tractracTunnel ? "tcp://"+tractracTunnelHost+":4412" : "tcp://germanmaster.traclive.dk:1520",
tractracTunnel ? "tcp://"+tractracTunnelHost+":4413" : "tcp://germanmaster.traclive.dk:1521", false, false, new AsyncCallback<Void>() {
service.track(rrDao, tractracTunnel ? "tcp://"+tractracTunnelHost+":1520" : "tcp://germanmaster.traclive.dk:1520",
tractracTunnel ? "tcp://"+tractracTunnelHost+":1521" : "tcp://germanmaster.traclive.dk:1521", false, false, new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
@@ -43,8 +43,8 @@ public class RaceTrackerTest {
paramUrl = new URL("http://germanmaster.traclive.dk/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");
liveUri = new URI("tcp://"+tractracTunnelHost+":1520");
storedUri = new URI("tcp://"+tractracTunnelHost+":1521");
} else {
// no tunnel:
liveUri = new URI("tcp://germanmaster.traclive.dk:1520");