Author: ljelinko Date: 2012-05-21 09:11:13 -0400 (Mon, 21 May 2012) New Revision: 41210 Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java Log: Renamed method in DetectRuntimeTemplate Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -11,17 +11,17 @@ public static final String VERSION = "2.2.2.Final"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SEAM_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("SEAM"); server.setVersion(VERSION); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -11,17 +11,17 @@ public static final String VERSION = "2.3.0.Beta1"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SEAM_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("SEAM"); server.setVersion(VERSION); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-eap-4.3"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EAP"); server.setVersion("4.3"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-eap-5.1"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EAP"); server.setVersion("5.1"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-eap-6.0"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EAP"); server.setVersion("6.0"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-epp-4.3"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EPP"); server.setVersion("4.3"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-epp-5.2"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EPP"); server.setVersion("5.2"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-ewp-5.1"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EWP"); server.setVersion("5.1"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,12 +9,12 @@ public static final String SERVER_ID = "jboss-as-7.1.1.Final"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("7.1"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,12 +9,12 @@ public static final String SERVER_ID = "jboss-soa-p-5"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("5.2"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,12 +9,12 @@ public static final String SERVER_ID = "jboss-soa-p-standalone-5"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("5.2"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -25,25 +25,25 @@ private SearchingForRuntimesDialog searchingForRuntimesDialog; - protected abstract String getRuntimeID(); + protected abstract String getServerRuntimeID(); - protected abstract Runtime getExpectedRuntime(); + protected abstract Runtime getExpectedServerRuntime(); @Test public void detectRuntime(){ preferences = new RuntimeDetectionPreferencesDialog(); preferences.open(); - preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); searchingForRuntimesDialog = preferences.search(); assertThat(searchingForRuntimesDialog.getRuntimes().size(), is(1)); - assertThat(searchingForRuntimesDialog.getRuntimes().get(0), new RuntimeMatcher(getExpectedRuntime())); + assertThat(searchingForRuntimesDialog.getRuntimes().get(0), new RuntimeMatcher(getExpectedServerRuntime())); } @After public void closePreferences(){ searchingForRuntimesDialog.ok(); - preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); preferences.ok(); } }