creating eventsSince for ContactSensor and AeonKeyFobs + commenting runAfter method...

[smartthings-infrastructure.git] / AeonKeyFob / AeonKeyFob.groovy

diff --git a/AeonKeyFob/AeonKeyFob.groovy b/AeonKeyFob/AeonKeyFob.groovy
index 8ece0c6db1864dafdc25036f103f982618f7b729..72e5afd419614b5789683d8960a4d17ca8cd76e8 100644 (file)
--- a/AeonKeyFob/AeonKeyFob.groovy
+++ b/AeonKeyFob/AeonKeyFob.groovy
@@ -2,12 +2,13 @@
 package AeonKeyFob
 import Timer.SimulatedTimer
 
+//JPF's Verify API
+import gov.nasa.jpf.vm.Verify
+
 public class AeonKeyFob {
        private String id
        private String label
        private String displayName
-       private List events = []
-       private List timeOfEvents = []
 
        AeonKeyFob(String id, String label, String displayName) {
                this.id = id
@@ -19,17 +20,43 @@ public class AeonKeyFob {
                def data = eventDataMap["data"]
                def value = eventDataMap["value"]
                println("the button with number $data is $value!")
-               this.events.add(eventDataMap)
-               this.timeOfEvents.add(System.currentTimeMillis())
        }
 
-       def eventsSince(Date dateObj) {
-               def List happenedEvents = []
-               def sinceThen = dateObj.time
-               for (int i = 0;i < timeOfEvents.size();i++) {
-                       if (timeOfEvents[i]>=sinceThen)
-                               happenedEvents.add(events[i])
+       def eventsSince() {
+               def evtHeld = [[name: "button", value: "held", deviceId: "aeonKeyFobID0", descriptionText: "",
+                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']]
+               def evtPushed = [[name: "button", value: "pushed", deviceId: "aeonKeyFobID0", descriptionText: "",
+                                 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']]
+               def init = Verify.getInt(0,4)
+               def evtToSend = []
+               if (init == 0) {//return empty set
+                       return evtToSend
+               } else if (init == 1) {//send one held event
+                       evtHeld.each{
+                               evtToSend.add(it)
+                       }
+                       return evtToSend
+               } else if (init == 2) {//send two held events
+                       evtHeld.each{
+                               evtToSend.add(it)
+                       }
+                       evtHeld.each{
+                               evtToSend.add(it)
+                       }
+                       return evtToSend
+               } else if (init == 3) {//send one pushed event
+                       evtPushed.each{
+                               evtToSend.add(it)
+                       }
+                       return evtToSend
+               } else if (init == 4) {//send two pushed events
+                       evtPushed.each{
+                               evtToSend.add(it)
+                       }
+                       evtPushed.each{
+                               evtToSend.add(it)
+                       }
+                       return evtToSend
                }
-               return happenedEvents
        }
 }