# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1399391265 -7200
# Node ID 32531a9626bf46d5a1b9d9c58b6554d1c2d2d87f
# Parent  dfddf572c7ec72439f30f18f154e8b8158b44d44# Parent  897d7f70c5a518c98141d1c69de79dd4e427d509
Continuing work on launcher unification

diff -r dfddf572c7ec -r 32531a9626bf rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java
--- a/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java	Tue May 06 16:48:12 2014 +0200
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java	Tue May 06 17:47:45 2014 +0200
@@ -18,8 +18,10 @@
 package org.apidesign.bck2brwsr.vmtest.impl;
 
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 import org.apidesign.bck2brwsr.launcher.Launcher;
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.BeforeGroups;
@@ -44,7 +46,14 @@
         if (js == null && create) {
             final String p = System.getProperty("vmtest.js", "script"); // NOI18N
             switch (p) {
-                case "brwsr": js = Launcher.createBrowser(null); break; // NOI18N
+                case "brwsr": // NOI18N
+                    String cmd = null;
+                    String pb = System.getProperty("vmtest.brwsrs"); // NOI18N
+                    if (pb != null) {
+                        cmd = pb.split(",")[0]; // NOI18N
+                    }
+                    js = brwsr(cmd);
+                    break;
                 case "script": js = Launcher.createJavaScript(); break; // NOI18N
                 default: throw new IllegalArgumentException(
                     "Unknown value of vmtest.js property: " + p
@@ -65,20 +74,22 @@
 
     @BeforeGroups("run")
     public void initializeLauncher() throws IOException {
+        Set<Launcher> all = new HashSet<>(brwsrs.values());
         if (js(false) != null) {
-            js(true).initialize();
+            all.add(js(true));
         }
-        for (Launcher launcher : brwsrs.values()) {
+        for (Launcher launcher : all) {
             launcher.initialize();
         }
     }
 
     @AfterGroups("run")
     public void shutDownLauncher() throws IOException, InterruptedException {
+        Set<Launcher> all = new HashSet<>(brwsrs.values());
         if (js(false) != null) {
-            js(true).shutdown();
+            all.add(js(true));
         }
-        for (Launcher launcher : brwsrs.values()) {
+        for (Launcher launcher : all) {
             launcher.shutdown();
         }
     }