From d8991171a1737985ff02d6ab5ad1fba9511d3585 Mon Sep 17 00:00:00 2001 From: saidone Date: Sat, 25 May 2024 07:53:58 +0200 Subject: [PATCH] use (c/filter) in test utils --- src/weller/pipe.clj | 6 +++--- test/weller/test_utils.clj | 38 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/weller/pipe.clj b/src/weller/pipe.clj index f31aedc..23c2a56 100644 --- a/src/weller/pipe.clj +++ b/src/weller/pipe.clj @@ -50,12 +50,12 @@ (defn make-tap "Return a filtered tap connected to the `mult` channel. - The returned tap is filtered by predicate `pred`." + The tap is filtered by predicate `pred`." [mult pred] (a/tap mult (a/chan 1 (filter pred)))) (defn add-filtered-tap - "Adds a filtered (by `pred`) tap to the pipe. Filtered messages are processed by function `f`." + "Add a filtered (by `pred`) tap to the pipe. Filtered messages are processed by function `f`." [this pred f] (if (:running this) (do @@ -71,7 +71,7 @@ (assoc this :taps []))) (defn make-pipe - "Creates a pipe with a built-in ActiveMQ listener. + "Create a pipe with a built-in ActiveMQ listener. If a predicate `pred` and a function `f` are provided, then also add a filtered tap to it and start the pipe." ([] ;; load configuration diff --git a/test/weller/test_utils.clj b/test/weller/test_utils.clj index c59f469..65d95bf 100644 --- a/test/weller/test_utils.clj +++ b/test/weller/test_utils.clj @@ -31,12 +31,12 @@ (defn- get-guest-home [] - (get-in (nodes/get-node (get-in @c/config [:alfresco :ticket]) "-root-" (model/map->GetNodeQueryParams {:relative-path "/Guest Home"})) [:body :entry :id])) + (get-in (nodes/get-node (c/ticket) "-root-" (model/map->GetNodeQueryParams {:relative-path "/Guest Home"})) [:body :entry :id])) (defn- create-folder [] (->> (model/map->CreateNodeBody {:name (.toString (UUID/randomUUID)) :node-type cm/type-folder}) - (nodes/create-node (get-in @c/config [:alfresco :ticket]) (get-guest-home)) + (nodes/create-node (c/ticket) (get-guest-home)) (#(get-in % [:body :entry :id])))) (defn- create-node @@ -46,26 +46,26 @@ (create-node name (get-guest-home))) ([name parent-id] (->> (model/map->CreateNodeBody {:name name :node-type cm/type-content}) - (nodes/create-node (get-in @c/config [:alfresco :ticket]) parent-id) + (nodes/create-node (c/ticket) parent-id) (#(get-in % [:body :entry :id]))))) (defn- update-node [node-id] (->> (model/map->UpdateNodeBody {:properties {cm/prop-title (.toString (UUID/randomUUID))}}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) node-id) + (nodes/update-node (c/ticket) node-id) (#(get-in % [:body :entry :id])))) (defn- update-node-content [node-id] (let [file-to-be-uploaded (File/createTempFile "tmp." ".txt")] (spit file-to-be-uploaded (gen-str (rand-int (math/pow 2 16)))) - (nodes/update-node-content (get-in @c/config [:alfresco :ticket]) node-id file-to-be-uploaded) + (nodes/update-node-content (c/ticket) node-id file-to-be-uploaded) (io/delete-file file-to-be-uploaded) node-id)) (defn- delete-node [node-id] - (nodes/delete-node (get-in @c/config [:alfresco :ticket]) node-id {:permanent true})) + (nodes/delete-node (c/ticket) node-id {:permanent true})) (defn create-then-update-then-delete-node ([] @@ -82,7 +82,7 @@ (let [node-id (create-node) folder-id (create-folder)] (->> (model/map->MoveNodeBody {:target-parent-id folder-id}) - (nodes/move-node (get-in @c/config [:alfresco :ticket]) node-id)) + (nodes/move-node (c/ticket) node-id)) (delete-node node-id) (delete-node folder-id))) @@ -90,7 +90,7 @@ [type] (let [created-node-id (create-node)] (->> (model/map->UpdateNodeBody {:node-type type}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (delete-node created-node-id))) (defn add-then-remove-property @@ -99,9 +99,9 @@ ([prop value] (let [created-node-id (create-node)] (->> (model/map->UpdateNodeBody {:properties {prop value}}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (->> (model/map->UpdateNodeBody {:properties {prop nil}}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (delete-node created-node-id)))) (defn change-property @@ -110,9 +110,9 @@ ([prop initial-value] (let [created-node-id (create-node)] (->> (model/map->UpdateNodeBody {:properties {prop initial-value}}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (->> (model/map->UpdateNodeBody {:properties {prop (.toString (UUID/randomUUID))}}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (delete-node created-node-id)))) (defn create-then-delete-child-assoc @@ -120,8 +120,8 @@ (let [parent-node-id (create-folder) child-node-id (create-node)] (->> [(model/map->CreateSecondaryChildBody {:child-id child-node-id :assoc-type cm/assoc-contains})] - (nodes/create-secondary-child (get-in @c/config [:alfresco :ticket]) parent-node-id)) - (nodes/delete-secondary-child (get-in @c/config [:alfresco :ticket]) parent-node-id child-node-id) + (nodes/create-secondary-child (c/ticket) parent-node-id)) + (nodes/delete-secondary-child (c/ticket) parent-node-id child-node-id) (delete-node child-node-id) (delete-node parent-node-id))) @@ -129,16 +129,16 @@ [] (let [created-node-id (create-node)] (->> (model/map->CreateNodeAssocsBody {:target-id created-node-id :assoc-type cm/assoc-contains}) - (nodes/create-node-assocs (get-in @c/config [:alfresco :ticket]) (get-guest-home))) - (nodes/delete-node-assocs (get-in @c/config [:alfresco :ticket]) (get-guest-home) created-node-id) + (nodes/create-node-assocs (c/ticket) (get-guest-home))) + (nodes/delete-node-assocs (c/ticket) (get-guest-home) created-node-id) (delete-node created-node-id))) (defn add-then-remove-aspect [aspect-name] (let [created-node-id (create-node) - aspect-names (get-in (nodes/get-node (get-in @c/config [:alfresco :ticket]) created-node-id) [:body :entry :aspect-names])] + aspect-names (get-in (nodes/get-node (c/ticket) created-node-id) [:body :entry :aspect-names])] (->> (model/map->UpdateNodeBody {:aspect-names (conj aspect-names aspect-name)}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (->> (model/map->UpdateNodeBody {:aspect-names aspect-names}) - (nodes/update-node (get-in @c/config [:alfresco :ticket]) created-node-id)) + (nodes/update-node (c/ticket) created-node-id)) (delete-node created-node-id))) \ No newline at end of file