Changeset 1566 for cobra/trunk/Tests/220-delegates-etc/120-events/300-raise.cobra

Timestamp:

07/31/08 21:19:39 (5 months ago)

Author:

Chuck.Esterbrook

Message:

Added support for omitting "this" and/or EventArgs?() in a "raise" statement.
Also, added warning that "this" is unnecessary and can be removed.
Also, added more error checking.

Files:

• cobra/trunk/Tests/220-delegates-etc/120-events/300-raise.cobra (modified) (2 diffs)

cobra/trunk/Tests/220-delegates-etc/120-events/300-raise.cobra

@@ -5 +5 @@
         event click as ClickHandler
 
-        def receiveMouseClick
+        def receiveMouseClick1
                 # pretend it's always in our bounds and we're enabled
-#               raise .click(this, EventArgs())
-                raise .click, this, EventArgs()
-#               raise .click, EventArgs()
-#               raise .click
-#               raise .click, this
+                raise .click, this, EventArgs()  # .warning. unnecessary "this"
+        
+        def receiveMouseClick2
+                raise .click, EventArgs()
+
+        def receiveMouseClick3
+                raise .click, this  # .warning. unnecessary "this"
+
+        def receiveMouseClick4
+                raise .click
 
 
@@ -18 +23 @@
         shared
 
-                var _didClick = false
+                var _butt as Button
+                var _clickCount = 0
                 
                 def main
-                        butt = Button()
+                        butt = _butt = Button()
+
                         listen butt.click, ref .handleClick
-                        assert not _didClick
-                        butt.receiveMouseClick
-                        assert _didClick
+                        assert .clickCount == 0
+
+                        butt.receiveMouseClick1
+                        assert .clickCount == 1
+
+                        butt.receiveMouseClick2
+                        assert .clickCount == 2
+
+                        butt.receiveMouseClick3
+                        assert .clickCount == 3
+
+                        butt.receiveMouseClick4
+                        assert .clickCount == 4
+
+                get clickCount from var
 
                 def handleClick(sender as Object, args as EventArgs)
-                        _didClick = true
+                        assert sender is _butt
+                        assert (args to dynamic?) inherits EventArgs
+                        _clickCount += 1