diff --git a/src/org/testKitGen/TestDivider.java b/src/org/testKitGen/TestDivider.java index 8d503d7f..82b03831 100644 --- a/src/org/testKitGen/TestDivider.java +++ b/src/org/testKitGen/TestDivider.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.io.StringReader; import java.io.FileReader; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -226,7 +227,15 @@ private Map getDataFromTRSS() { String level = getLevel(); Map map = new HashMap(); String URL = constructURL(impl, plat, group, level); - String command = "curl --silent --max-time 120 -L " + URL; + String osName = System.getProperty("os.name").toLowerCase(); + String command; + + if (osName.contains("win")) { + command = "cmd.exe /c curl --silent --max-time 120 -L -k \"" + URL + "\""; + } else { + command = "curl --silent --max-time 120 -L -k " + URL; + } + System.out.println("Attempting to get test duration data from TRSS."); System.out.println(command); Process process; @@ -238,7 +247,7 @@ private Map getDataFromTRSS() { } try (InputStream responseStream = process.getInputStream(); Reader responseReader = new BufferedReader(new InputStreamReader(responseStream))) { - parseDuration(responseReader, map); + parseDuration(responseReader, map); } catch (IOException | ParseException e) { System.out.println("Warning: cannot parse data from TRSS."); e.printStackTrace(); @@ -276,7 +285,15 @@ private Queue> createDurationQueue() { Map testsInvalid = new HashMap<>(); for (String test : allTests) { if (matchTRSS.contains(test) || matchCache.contains(test)) { - int duration = TRSSMap.containsKey(test) ? TRSSMap.get(test) : cacheMap.get(test); + int duration; + if (TRSSMap.containsKey(test)) { + duration = TRSSMap.get(test); + System.out.println("TRSSMap.get(" + test + "): " + duration); + } else { + duration = cacheMap.get(test); + System.out.println("cacheMap.get(" + test + "): " + duration); + } + // int duration = TRSSMap.containsKey(test) ? TRSSMap.get(test) : cacheMap.get(test); if (duration > 0) { durationQueue.offer(new AbstractMap.SimpleEntry<>(test, duration)); } else {