Swapped actual/expected in all tests, so that expected comes first. (#…

…397)
polyfy · Nov 22, 2023 · c7e7a64 · c7e7a64
1 parent c3bd12d
commit c7e7a64
Show file tree

Hide file tree

Showing 77 changed files with 1,083 additions and 1,110 deletions.
diff --git a/bases/poly-cli/test/polylith/clj/core/poly_cli/core_missing_configs_test.clj b/bases/poly-cli/test/polylith/clj/core/poly_cli/core_missing_configs_test.clj
@@ -8,14 +8,16 @@
 (deftest check-a-valid-workspace
   (let [output (read-string (with-out-str
                               (cli/-main "ws" "get:ws-type" "ws-dir:examples/local-dep" "color-mode:none" ":no-exit")))]
-    (is (= output "toolsdeps2"))
-    (is (= (cli/-main "check" "ws-dir:examples/local-dep" ":no-exit")
-           0))))
+    (is (= "toolsdeps2"
+           output))
+    (is (= 0
+           (cli/-main "check" "ws-dir:examples/local-dep" ":no-exit")))))
 
 (deftest check-an-old-valid-workspace
   (let [output (read-string (with-out-str
                               (cli/-main "ws" "get:ws-type" "ws-dir:examples/local-dep-old-format" "color-mode:none" ":no-exit")))]
-    (is (= output "toolsdeps1"))
+    (is (= "toolsdeps1"
+           output))
     (is (= (cli/-main "check" "ws-dir:examples/local-dep-old-format" ":no-exit")
            0))))
 
@@ -25,29 +27,37 @@
                                       ws-config/ws-config-from-disk (fn [_] [nil "Missing workspace config"])]
                           (cli/-main "check" "ws-dir:examples/local-dep" "color-mode:none" ":no-exit")))
         output (with-out-str (check-fn))]
-    (is (= output "  Missing workspace config\n"))
-    (is (= (check-fn) 1))))
+    (is (= "  Missing workspace config\n"
+           output))
+    (is (= 1
+           (check-fn)))))
 
 (deftest check-a-workspace-with-missing-development-config-file
   (let [check-fn (fn [] (with-redefs [config-reader/file-exists? (fn [_ type] (not= :development type))
                                       validator/validate-project-dev-config (fn [_ _ _] "Missing file")]
                           (cli/-main "check" "ws-dir:examples/local-dep" "color-mode:none" ":no-exit")))
         output (with-out-str (check-fn))]
-    (is (= output "  Missing file\n"))
-    (is (= (check-fn) 1))))
+    (is (= "  Missing file\n"
+           output))
+    (is (= 1
+           (check-fn)))))
 
 (deftest check-a-workspace-with-missing-project-config-file
   (let [check-fn (fn [] (with-redefs [validator/validate-project-deployable-config (fn [_ _ _] "Invalid file")]
                           (cli/-main "check" "ws-dir:examples/local-dep" "color-mode:none" ":no-exit")))
         output (with-out-str (check-fn))]
-    (is (= output "  Error 110: Invalid file\n"))
-    (is (= (check-fn) 110))))
+    (is (= "  Error 110: Invalid file\n"
+           output))
+    (is (= 110
+           (check-fn)))))
 
 (deftest check-a-workspace-with-illegal-component-config-file
   (let [check-fn (fn [] (with-redefs [validator/validate-brick-config (fn [_ _ config-filename]
                                                                         (when (= config-filename "components/without-src/deps.edn")
                                                                           "Invalid file"))]
                           (cli/-main "check" "ws-dir:examples/local-dep" "color-mode:none" ":no-exit")))
         output (with-out-str (check-fn))]
-    (is (= output "  Error 110: Invalid file\n"))
-    (is (= (check-fn) 110))))
+    (is (= "  Error 110: Invalid file\n"
+           output))
+    (is (= 110
+           (check-fn)))))
diff --git a/components/api/deps.edn b/components/api/deps.edn
@@ -1,4 +1,4 @@
 {:paths ["src"]
  :deps {}
- :aliases {:test {:extra-paths ["test"]
+ :aliases {:test {:extra-paths []
                   :extra-deps {}}}}
diff --git a/components/api/test/polylith/clj/core/api/interface_test.clj b/components/api/test/polylith/clj/core/api/interface_test.clj
diff --git a/components/change/test/polylith/clj/core/change/brick_test.clj b/components/change/test/polylith/clj/core/change/brick_test.clj
@@ -14,7 +14,7 @@
             "todo.txt"])
 
 (deftest bricks--when-having-a-list-of-changed-files--return-bases-and-components
-  (is (= (brick/changed-entities files {:missing []})
-         {:changed-bases ["core"]
+  (is (= {:changed-bases ["core"]
           :changed-components ["cmd" "workspace"]
-          :changed-projects []})))
+          :changed-projects []}
+         (brick/changed-entities files {:missing []}))))
diff --git a/components/change/test/polylith/clj/core/change/bricks_to_test_test.clj b/components/change/test/polylith/clj/core/change/bricks_to_test_test.clj
@@ -28,154 +28,155 @@
 ;; or if we include it with project:dev.
 
 (deftest project-to-bricks-to-test--with-one-changed-component--returns-bricks-to-test-for-changed-projects
-  (is (= (test {:changed-projects []
+  (is (= {"core" ["article"]
+          "development" []}
+         (test {:changed-projects []
                 :settings {}
                 :changed-components ["article"]
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks nil
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests false})
-         {"core" ["article"]
-          "development" []})))
+                :is-run-all-brick-tests false}))))
 
 (deftest project-to-bricks-to-test--with-one-changed-component-that-is-excluded---returns-bricks-to-test-for-changed-projects
-  (is (= (test {:changed-projects []
+  (is (= {"core" []
+          "development" []}
+         (test {:changed-projects []
                 :settings {:projects {"core" {:test {:include []}}}}
                 :changed-components ["article"]
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks nil
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests false})
-         {"core" []
-          "development" []})))
+                :is-run-all-brick-tests false}))))
 
 (deftest project-to-bricks-to-test--with-run-all-selected--returns-all-bricks
-  (is (= (test {:changed-projects []
+  (is (= {"core" ["article"
+                  "comment"
+                  "rest-api"
+                  "tag"
+                  "user"]
+          "development" []}
+         (test {:changed-projects []
                 :settings {}
                 :changed-components ["article"]
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks nil
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests true})
-         {"core" ["article"
+                :is-run-all-brick-tests true}))))
+
+(deftest project-to-bricks-to-test--with-run-all-brick-tests-and-development-included--returns-all-bricks
+  (is (= {"core" ["article"
                   "comment"
                   "rest-api"
                   "tag"
                   "user"]
-          "development" []})))
-
-(deftest project-to-bricks-to-test--with-run-all-brick-tests-and-development-included--returns-all-bricks
-  (is (= (test {:changed-projects []
+          "development" ["article"
+                         "comment"
+                         "profile"
+                         "rest-api"
+                         "tag"
+                         "user"]}
+         (test {:changed-projects []
                 :settings {}
                 :changed-components ["article"]
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks nil
                 :selected-projects #{}
                 :is-dev-user-input true
-                :is-run-all-brick-tests true})
-         {"core" ["article"
-                  "comment"
-                  "rest-api"
-                  "tag"
-                  "user"]
+                :is-run-all-brick-tests true}))))
+
+(deftest project-to-bricks-to-test--with-run-all-brick-tests-and-development-selected--returns-all-bricks-for-development
+  (is (= {"core" []
           "development" ["article"
                          "comment"
                          "profile"
                          "rest-api"
                          "tag"
-                         "user"]})))
-
-(deftest project-to-bricks-to-test--with-run-all-brick-tests-and-development-selected--returns-all-bricks-for-development
-  (is (= (test {:changed-projects []
+                         "user"]}
+         (test {:changed-projects []
                 :settings {}
                 :changed-components ["article"]
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks nil
                 :selected-projects #{"dev"}
                 :is-dev-user-input false
-                :is-run-all-brick-tests true})
-         {"core" []
-          "development" ["article"
-                         "comment"
-                         "profile"
-                         "rest-api"
-                         "tag"
-                         "user"]})))
+                :is-run-all-brick-tests true}))))
 
 (deftest project-to-bricks-to-test--include-two-bricks--returns-the-two-bricks
-  (is (= (test {:changed-projects []
+  (is (= {"core" ["tag"
+                  "user"]
+          "development" []}
+         (test {:changed-projects []
                 :settings {:projects {"core" {:test {:include ["tag" "user"]}}}}
                 :changed-components ["article" "comment" "rest-api" "tag" "user"]
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks nil
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests false})
-         {"core" ["tag"
-                  "user"]
-          "development" []})))
+                :is-run-all-brick-tests false}))))
 
 (deftest project-to-bricks-to-test--when-the-project-itself-has-changed--return-all-bricks-for-that-project
-  (is (= (test {:changed-projects ["core"]
-                :settings {}
-                :changed-components ["article"]
-                :changed-bases []
-                :project-to-indirect-changes {}
-                :selected-bricks nil
-                :selected-projects #{}
-                :is-dev-user-input false
-                :is-run-all-brick-tests false})
-         {"core" ["article"
+  (is (= {"core" ["article"
                   "comment"
                   "rest-api"
                   "tag"
                   "user"]
-          "development" []})))
-
-(deftest project-to-bricks-to-test--with-two-changed-components-and-one-selected-brick--returns-selected-bricks-that-are-also-changed
-  (is (= (test {:changed-projects []
+          "development" []}
+         (test {:changed-projects ["core"]
                 :settings {}
-                :changed-components ["article" "user"]
+                :changed-components ["article"]
                 :changed-bases []
                 :project-to-indirect-changes {}
-                :selected-bricks ["user"]
+                :selected-bricks nil
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests false})
-         {"core" ["user"]
-          "development" []})))
+                :is-run-all-brick-tests false}))))
+
+(deftest project-to-bricks-to-test--with-two-changed-components-and-one-selected-brick--returns-selected-bricks-that-are-also-changed
+  (is (=
+        {"core" ["user"]
+         "development" []}
+        (test {:changed-projects []
+               :settings {}
+               :changed-components ["article" "user"]
+               :changed-bases []
+               :project-to-indirect-changes {}
+               :selected-bricks ["user"]
+               :selected-projects #{}
+               :is-dev-user-input false
+               :is-run-all-brick-tests false}))))
 
 (deftest project-to-bricks-to-test--with-no-changed-components-and-one-selected-brick--returns-no-bricks
-  (is (= (test {:changed-projects []
+  (is (= {"core" []
+          "development" []}
+         (test {:changed-projects []
                 :settings {}
                 :changed-components []
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks ["tag"]
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests false})
-         {"core" []
-          "development" []})))
+                :is-run-all-brick-tests false}))))
 
 (deftest project-to-bricks-to-test--with-no-changed-components-and-one-selected-brick-with-run-all-brick-tests--returns-selected-brick
-  (is (= (test {:changed-projects []
+  (is (= {"core" ["tag"]
+          "development" []}
+         (test {:changed-projects []
                 :settings {}
                 :changed-components []
                 :changed-bases []
                 :project-to-indirect-changes {}
                 :selected-bricks ["tag"]
                 :selected-projects #{}
                 :is-dev-user-input false
-                :is-run-all-brick-tests true})
-         {"core" ["tag"]
-          "development" []})))
+                :is-run-all-brick-tests true}))))
diff --git a/components/change/test/polylith/clj/core/change/indirect_test.clj b/components/change/test/polylith/clj/core/change/indirect_test.clj
@@ -63,8 +63,7 @@
              "change" {:src {:direct ["git" "util"], :indirect ["shell"]}}}]])
 
 (deftest project-to-indirect-changes--based-on-dependencies-and-changed-components--return-indirectly-changed-bricks-per-project
-  (is (= (indirect/project-to-indirect-changes deps #{"change" "help"})
-         {"cli"  {:src  ["cli"
+  (is (= {"cli"  {:src  ["cli"
                          "command"
                          "z-jocke"]
                   :test []}
@@ -75,4 +74,6 @@
           "dev"  {:src  ["cli"
                          "command"
                          "z-jocke"]
-                  :test []}})))
+                  :test []}}
+         (indirect/project-to-indirect-changes deps #{"change" "help"}))))
+
diff --git a/components/change/test/polylith/clj/core/change/project_test.clj b/components/change/test/polylith/clj/core/change/project_test.clj
@@ -15,5 +15,6 @@
 (def changed-bricks #{"workspace" "cmd" "core"})
 
 (deftest changed-projects--when-two-of-three-projects-contain-changed-bricks--return-the-projects-with-then-changed-bricks
-  (is (= (project/indirectly-changed-project-names projects changed-bricks)
-         #{"core" "dev"})))
+  (is (= #{"core" "dev"}
+         (project/indirectly-changed-project-names projects changed-bricks))))
+