diff options
| author | Jose <jose@zeroc.com> | 2015-09-17 22:58:49 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-09-17 22:58:49 +0200 |
| commit | fd91507e8cfdc85eeed3e697123db15b1761f194 (patch) | |
| tree | 9ecc2e6260b972ca2192ad862c22f9aafedc8415 /js/test | |
| parent | Missing js:ice-build metadata (diff) | |
| download | ice-fd91507e8cfdc85eeed3e697123db15b1761f194.tar.bz2 ice-fd91507e8cfdc85eeed3e697123db15b1761f194.tar.xz ice-fd91507e8cfdc85eeed3e697123db15b1761f194.zip | |
Update for JS browser test suite server languages
Diffstat (limited to 'js/test')
| -rw-r--r-- | js/test/Common/TestSuite.js | 42 | ||||
| -rw-r--r-- | js/test/Common/index.html | 3 |
2 files changed, 30 insertions, 15 deletions
diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js index c77eb61c1a6..7d1d38576c4 100644 --- a/js/test/Common/TestSuite.js +++ b/js/test/Common/TestSuite.js @@ -263,6 +263,35 @@ $(document).ready( } $("#test").val("/test/" + current + "/index.html"); + var nextLanguage; + $.ajax( + { + url: "/server-languages.json", + dataType: "json" + } + ).done( + function(data) + { + data.languages.forEach( + function(lang) + { + $("#language").append("<option value=\"" + lang.value + "\">" + lang.name + "</option>"); + }); + + nextLanguage = function(language) + { + var i = 0; + for(; i < data.languages.length; ++i) + { + if(data.languages[i].value == language) + { + break; + } + } + return data.languages[i < data.languages.length - 1 ? i + 1 : 0].value; + }; + }); + var out = { write: function(msg) @@ -441,18 +470,7 @@ $(document).ready( protocol = "ws"; href = href.replace("https", "http"); href = href.replace("9090", "8080"); - if(language == "cpp") - { - language = "java"; - } - else if(language == "java") - { - language = "csharp"; - } - else - { - language = "cpp"; - } + language = nextLanguage(language); } } diff --git a/js/test/Common/index.html b/js/test/Common/index.html index adc6ef5400d..fb26feb2447 100644 --- a/js/test/Common/index.html +++ b/js/test/Common/index.html @@ -53,9 +53,6 @@ </div> <div class="small-9 columns"> <select id="language"> - <option value="cpp">C++</option> - <option value="java">Java</option> - <option value="csharp">C#</option> </select> </div> </div> |