From 0f2c72921c321a6e8ae1df16c3dd5a207da68c64 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 19 Jan 2012 17:41:09 +0100 Subject: [PATCH] also changed the ports for TracTrac tunneling to 1520/1521 --- .../com/sap/sailing/domain/test/AbstractTracTracLiveTest.java | 4 ++-- .../sap/sailing/domain/test/MultipleClassesInEventTest.java | 4 ++-- .../com/sap/sailing/domain/test/OnlineTracTracBasedTest.java | 4 ++-- .../domain/test/UnicodeCharactersInCompetitorNamesTest.java | 4 ++-- .../sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java | 4 ++-- .../src/com/sap/sailing/server/test/RaceTrackerTest.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java index ee7ddbb7ab6..4f23323bc1e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java @@ -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 { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInEventTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInEventTest.java index edb8ec67054..5ece3a09aff 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInEventTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInEventTest.java @@ -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( diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index 43c4478bcfb..34b3ac9dbf2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -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()); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java index 890f4ac2e5f..180b7aa1a35 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java @@ -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 competitors = fourtyninerYellow_2.getRacesHandle().getRaces().iterator().next().getCompetitors(); diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java index ac2759f2f6a..e9f97cf49fa 100644 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java @@ -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() { + 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() { @Override public void onFailure(Throwable caught) { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index 510cb3c4198..172e012fbdc 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -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");