test: fix integration tests

Author: TimoKramer

deps.edn

@@ -4,7 +4,9 @@
         org.jline/jline-terminal-ffm {:mvn/version "3.30.6"
                                       :exclusions [org.jline/jline-native]}
         org.jline/jline-reader {:mvn/version "3.30.6"}}
+
  :aliases
+
  {:test {:extra-paths ["test"]
          :extra-deps {io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
          :main-opts ["-m" "cognitect.test-runner"]

src/charm/input/mouse.clj

@@ -186,3 +186,13 @@
   "Check if a mouse event is a middle click."
   [event]
   (and (click? event) (= (:button event) button-middle)))
+
+(defn wheel-up?
+  "Check if a mouse event is a wheel up."
+  [event]
+  (and (wheel? event) (= (:button event) button-wheel-up)))
+
+(defn wheel-down?
+  "Check if a mouse event is a wheel down."
+  [event]
+  (and (wheel? event) (= (:button event) button-wheel-down)))

test/charm/integration/input_test.clj

@@ -5,7 +5,8 @@
    user input and verify the full input → parse → event pipeline."
   (:require
    [clojure.test :refer [deftest is testing]]
-   [charm.input.handler :as input])
+   [charm.input.handler :as input]
+   [charm.input.mouse :as mouse])
   (:import
    [java.io ByteArrayInputStream ByteArrayOutputStream]
    [org.jline.terminal TerminalBuilder]))
@@ -79,19 +80,19 @@
       (is (= {:type :backspace}
              (input/read-event terminal)))))
 
-  (testing "ctrl+c"
+  (testing "ctrl+c is intercepted by jline"
     (with-test-terminal [terminal "\u0003"]
-      (is (= {:type :ctrl+c}
+      (is (= nil
              (input/read-event terminal)))))
 
-  (testing "ctrl+d"
+  (testing "ctrl+d is intercepted by jline"
     (with-test-terminal [terminal "\u0004"]
-      (is (= {:type :ctrl+d}
+      (is (= {:type :runes :runes "d" :ctrl true}
              (input/read-event terminal)))))
 
-  (testing "ctrl+z"
+  (testing "ctrl+z is intercepted by jline"
     (with-test-terminal [terminal "\u001a"]
-      (is (= {:type :ctrl+z}
+      (is (= nil
              (input/read-event terminal))))))
 
 ;; ---------------------------------------------------------------------------
@@ -279,43 +280,45 @@
   (testing "mouse click at position"
     (with-test-terminal [terminal "\u001b[<0;10;5M"]
       (let [event (input/read-event terminal)]
-        (is (= :mouse (:type event)))
+        (is (mouse/mouse-event? event))
         (is (= 10 (:x event)))
         (is (= 5 (:y event)))
         (is (= :press (:action event)))
-        (is (= :left (:button event))))))
+        (is (mouse/left-click? event)))))
 
   (testing "mouse release"
     (with-test-terminal [terminal "\u001b[<0;10;5m"]
       (let [event (input/read-event terminal)]
-        (is (= :mouse (:type event)))
+        (is (mouse/mouse-event? event))
         (is (= :release (:action event))))))
 
   (testing "right mouse button"
     (with-test-terminal [terminal "\u001b[<2;15;20M"]
       (let [event (input/read-event terminal)]
-        (is (= :mouse (:type event)))
-        (is (= :right (:button event)))
+        (is (mouse/mouse-event? event))
+        (is (mouse/right-click? event))
         (is (= 15 (:x event)))
         (is (= 20 (:y event))))))
 
   (testing "middle mouse button"
     (with-test-terminal [terminal "\u001b[<1;5;10M"]
       (let [event (input/read-event terminal)]
-        (is (= :mouse (:type event)))
-        (is (= :middle (:button event))))))
+        (is (mouse/mouse-event? event))
+        (is (mouse/middle-click? event)))))
 
   (testing "mouse scroll up"
     (with-test-terminal [terminal "\u001b[<64;10;10M"]
       (let [event (input/read-event terminal)]
-        (is (= :mouse (:type event)))
-        (is (= :scroll-up (:button event))))))
+        (is (mouse/mouse-event? event))
+        (is (mouse/wheel? event))
+        (is (mouse/wheel-up? event)))))
 
   (testing "mouse scroll down"
     (with-test-terminal [terminal "\u001b[<65;10;10M"]
       (let [event (input/read-event terminal)]
-        (is (= :mouse (:type event)))
-        (is (= :scroll-down (:button event)))))))
+        (is (mouse/mouse-event? event))
+        (is (mouse/wheel? event))
+        (is (mouse/wheel-down? event))))))
 
 ;; ---------------------------------------------------------------------------
 ;; Multiple Sequential Events

user/dev.clj

@@ -1,4 +1,10 @@
-(ns dev
-  (:require [clojure.test :refer [run-all-tests]]))
+(ns dev)
 
-(run-all-tests #"charm.*-test")
+(comment
+  (require '[clojure.test :refer [run-all-tests]])
+  (run-all-tests #"charm.*-test"))
+
+(comment
+  (require '[portal.api :as p])
+  (def p (p/open))
+  (add-tap #'p/submit))