Fix automated test now that the old SMS interface was removed.

kripken · Sep 22, 2014 · d8eae34 · d8eae34
1 parent 1149331
commit d8eae34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/midp/sms.js b/midp/sms.js
@@ -40,6 +40,7 @@ function receiveSms(text, addr) {
 function promptForMessageText() {
     var el = document.getElementById('sms-listener-prompt').cloneNode(true);
     el.style.display = 'block';
+    el.classList.add('visible');
 
     var input = el.querySelector('input');
     var btnCancel = el.querySelector('button.cancel');

diff --git a/tests/automation.js b/tests/automation.js
@@ -57,17 +57,14 @@ casper.test.begin("unit tests", 5 + gfxTests.length, function(test) {
     casper
     .thenOpen("http://localhost:8000/index.html?midletClassName=tests.sms.SMSMIDlet&main=com/sun/midp/main/MIDletSuiteLoader", function() {
         this.waitForText("START", function() {
-            this.waitForSelector("#sms_text", function() {
-                this.waitForSelector("#sms_addr", function() {
-                    this.waitForSelector("#sms_receive", function() {
-                        this.sendKeys("#sms_text", "Prova SMS", { reset: true });
-                        this.sendKeys("#sms_addr", "+77777777777", { reset: true });
-                        this.click("#sms_receive");
-
-                        this.waitForText("DONE", function() {
-                            test.assertTextDoesntExist("FAIL");
-                        });
-                    });
+            this.evaluate(function() {
+                promptForMessageText();
+            });
+            this.waitUntilVisible(".sms-listener-prompt", function() {
+                this.sendKeys(".sms-listener-prompt.visible input", "Prova SMS", { reset: true });
+                this.click(".sms-listener-prompt.visible button.recommend");
+                this.waitForText("DONE", function() {
+                    test.assertTextDoesntExist("FAIL");
                 });
             });
         });

diff --git a/tests/midlets/sms/SMSMIDlet.java b/tests/midlets/sms/SMSMIDlet.java
@@ -21,7 +21,7 @@ public void run() {
                 System.out.println("FAIL - Wrong SMS text: " + message.getPayloadText());
             }
 
-            if (!message.getAddress().equals("sms://+77777777777:5000")) {
+            if (!message.getAddress().equals("sms://unknown:5000")) {
                 System.out.println("FAIL - Wrong SMS address: " + message.getAddress());
             }
         } catch (Exception e) {