Skip to content

Commit

Permalink
use (c/filter) in test utils
Browse files Browse the repository at this point in the history
  • Loading branch information
saidone75 committed May 25, 2024
1 parent a6450a6 commit d899117
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions src/weller/pipe.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
38 changes: 19 additions & 19 deletions test/weller/test_utils.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
([]
Expand All @@ -82,15 +82,15 @@
(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)))

(defn change-type
[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
Expand All @@ -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
Expand All @@ -110,35 +110,35 @@
([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
[]
(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)))

(defn create-then-delete-peer-assoc
[]
(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)))

1 comment on commit d899117

@saidone75
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean (c/ticket).

Please sign in to comment.