From acc6ce051d07ccadda6ffd9798b4ee95f1845cb6 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 10 Aug 2015 16:15:32 +0200
Subject: [PATCH] fix ITs

---
 .../resources/server/ServerTest/url_ending_by_jsp.html |  6 +++---
 .../resources/ui/i18n/default-locale-is-english.html   |  8 ++++----
 .../src/test/resources/ui/i18n/french-locale.html      |  8 ++++----
 .../src/test/resources/ui/i18n/french-pack.html        | 10 ----------
 .../resources/ui/i18n/locale-with-france-country.html  |  8 ++++----
 .../resources/ui/i18n/locale-with-swiss-country.html   |  8 ++++----
 6 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html b/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html
index 194ed4bd07b..ffb2216a1b3 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html
+++ b/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html
@@ -9,12 +9,12 @@
     <tbody>
     <tr>
         <td>open</td>
-        <td>/sonar/dashboard/index/myproject.jsp</td>
+        <td>/sonar/overview/index/myproject.jsp</td>
         <td></td>
     </tr>
     <tr>
-        <td>assertElementPresent</td>
-        <td>dashboard</td>
+        <td>waitForElementPresent</td>
+        <td>css=.overview</td>
         <td></td>
     </tr>
 </table>
diff --git a/it/it-tests/src/test/resources/ui/i18n/default-locale-is-english.html b/it/it-tests/src/test/resources/ui/i18n/default-locale-is-english.html
index a918e54543b..71123d9ce0c 100644
--- a/it/it-tests/src/test/resources/ui/i18n/default-locale-is-english.html
+++ b/it/it-tests/src/test/resources/ui/i18n/default-locale-is-english.html
@@ -15,7 +15,7 @@
   <tbody>
   <tr>
     <td>open</td>
-    <td>/sonar/dashboard/index/sample?locale=foo</td>
+    <td>/sonar/overview/index?id=sample&locale=foo</td>
     <td></td>
   </tr>
   <tr>
@@ -24,9 +24,9 @@
     <td>regexp:.*Jan.*|.*Feb.*|.*Mar.*|.*Apr.*|.*May.*|.*Jun.*|.*Jul.*|.*Aug.*|.*Sep.*|.*Oct.*|.*Nov.*|.*Dec.*</td>
   </tr>
   <tr>
-    <td>assertText</td>
-    <td>m_duplicated_lines_density</td>
-    <td>0.0%</td>
+    <td>waitForText</td>
+    <td>css=.overview</td>
+    <td>*0.0%*</td>
   </tr>
   </tbody>
 </table>
diff --git a/it/it-tests/src/test/resources/ui/i18n/french-locale.html b/it/it-tests/src/test/resources/ui/i18n/french-locale.html
index e4c8681e3fd..8fd6d8db3dd 100644
--- a/it/it-tests/src/test/resources/ui/i18n/french-locale.html
+++ b/it/it-tests/src/test/resources/ui/i18n/french-locale.html
@@ -15,7 +15,7 @@
   <tbody>
   <tr>
     <td>open</td>
-    <td>/sonar/dashboard/index/sample?locale=fr</td>
+    <td>/sonar/overview/index?id=sample&locale=fr</td>
     <td></td>
   </tr>
   <tr>
@@ -24,9 +24,9 @@
     <td>regexp:.*jan.*|.*fév.*|.*mar.*|.*avr.*|.*mai.*|.*juin.*|.*juil.*|.*août.*|.*sept.*|.*oct.*|.*nov.*|.*déc.*</td>
   </tr>
   <tr>
-    <td>assertText</td>
-    <td>m_duplicated_lines_density</td>
-    <td>0,0%</td>
+    <td>waitForText</td>
+    <td>css=.overview</td>
+    <td>*0,0%*</td>
   </tr>
   </tbody>
 </table>
diff --git a/it/it-tests/src/test/resources/ui/i18n/french-pack.html b/it/it-tests/src/test/resources/ui/i18n/french-pack.html
index ce98f2206a5..6f3d925491f 100644
--- a/it/it-tests/src/test/resources/ui/i18n/french-pack.html
+++ b/it/it-tests/src/test/resources/ui/i18n/french-pack.html
@@ -23,16 +23,6 @@
     <td>css=.navbar</td>
     <td>glob:*Se connecter*</td>
   </tr>
-  <tr>
-    <td>open</td>
-    <td>/sonar/dashboard/index/sample?locale=fr</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>assertText</td>
-    <td>css=.size</td>
-    <td>glob:*Lignes de code*</td>
-  </tr>
   </tbody>
 </table>
 </body>
diff --git a/it/it-tests/src/test/resources/ui/i18n/locale-with-france-country.html b/it/it-tests/src/test/resources/ui/i18n/locale-with-france-country.html
index 2839f332c2d..e8c6431f414 100644
--- a/it/it-tests/src/test/resources/ui/i18n/locale-with-france-country.html
+++ b/it/it-tests/src/test/resources/ui/i18n/locale-with-france-country.html
@@ -15,7 +15,7 @@
   <tbody>
   <tr>
     <td>open</td>
-    <td>/sonar/dashboard/index/sample?locale=fr-FR</td>
+    <td>/sonar/overview/index?id=sample&locale=fr-FR</td>
     <td></td>
   </tr>
   <tr>
@@ -24,9 +24,9 @@
     <td>regexp:.*jan.*|.*fév.*|.*mar.*|.*avr.*|.*mai.*|.*juin.*|.*juil.*|.*août.*|.*sept.*|.*oct.*|.*nov.*|.*déc.*</td>
   </tr>
   <tr>
-    <td>assertText</td>
-    <td>m_duplicated_lines_density</td>
-    <td>0,0%</td>
+    <td>waitForText</td>
+    <td>css=.overview</td>
+    <td>*0,0%*</td>
   </tr>
   </tbody>
 </table>
diff --git a/it/it-tests/src/test/resources/ui/i18n/locale-with-swiss-country.html b/it/it-tests/src/test/resources/ui/i18n/locale-with-swiss-country.html
index e2caf04b56c..6073c0f5127 100644
--- a/it/it-tests/src/test/resources/ui/i18n/locale-with-swiss-country.html
+++ b/it/it-tests/src/test/resources/ui/i18n/locale-with-swiss-country.html
@@ -15,7 +15,7 @@
   <tbody>
   <tr>
     <td>open</td>
-    <td>/sonar/dashboard/index/sample?locale=fr-CH</td>
+    <td>/sonar/overview/index?id=sample&locale=fr-CH</td>
     <td></td>
   </tr>
   <tr>
@@ -24,9 +24,9 @@
     <td>regexp:.*jan.*|.*fév.*|.*mar.*|.*avr.*|.*mai.*|.*juin.*|.*juil.*|.*août.*|.*sept.*|.*oct.*|.*nov.*|.*déc.*</td>
   </tr>
   <tr>
-    <td>assertText</td>
-    <td>m_duplicated_lines_density</td>
-    <td>0.0%</td>
+    <td>waitForText</td>
+    <td>css=.overview</td>
+    <td>*0.0%*</td>
   </tr>
   </tbody>
 </table>
-- 
2.39.5