Added the models gen/fn-simple-symbol, gen/fn-qualified-symbol, gen/fn-simple-keyword and gen/fn-qualified-keyword.

Author: green-coder

CHANGELOG

@@ -9,6 +9,11 @@ Versions prior to v0.1.0 are considered experimental, their API may change.
 
 ### Added
 - this changelog file.
+- the models `gen/fn-simple-symbol`, `gen/fn-qualified-symbol`,
+  `gen/fn-simple-keyword` and `gen/fn-qualified-keyword`.
+
+### Changed
+- the models `gen/fn-symbol`, `gen/fn-keyword` now generate qualified symbols and keywords,
 
 ## [0.0.3] - 2020-07-26
 

src/minimallist/generator.cljc

@@ -33,25 +33,37 @@
   fn-double? (-> (h/fn double?)
                  (h/with-test-check-gen gen/double)))
 
-(def ^{:doc "A model that matches any number and generates intergers and doubles."}
+(def ^{:doc "A model that matches any number and generates integers and doubles."}
   fn-number? (-> (h/fn number?)
                  (h/with-test-check-gen (gen/one-of [gen/nat gen/double]))))
 
 (def ^{:doc "A model that matches strings and generates alphanumeric strings."}
   fn-string? (-> (h/fn string?)
                  (h/with-test-check-gen gen/string-alphanumeric)))
 
-(def ^{:doc "A model that matches and generates symbols."}
+(def ^{:doc "A model that matches and generates symbols with or without a namespace."}
   fn-symbol? (-> (h/fn symbol?)
-                 (h/with-test-check-gen gen/symbol)))
+                 (h/with-test-check-gen (gen/one-of [gen/symbol gen/symbol-ns]))))
 
-(def ^{:doc "A model that matches and generates keywords."}
+(def ^{:doc "A model that matches and generates symbols without a namespace."}
+  fn-simple-symbol? (-> (h/fn simple-symbol?)
+                        (h/with-test-check-gen gen/symbol)))
+
+(def ^{:doc "A model that matches and generates symbols with a namespace."}
+  fn-qualified-symbol? (-> (h/fn qualified-symbol?)
+                           (h/with-test-check-gen gen/symbol-ns)))
+
+(def ^{:doc "A model that matches and generates keywords with or without a namespace."}
   fn-keyword? (-> (h/fn keyword?)
-                  (h/with-test-check-gen gen/keyword)))
+                  (h/with-test-check-gen (gen/one-of [gen/keyword gen/keyword-ns]))))
+
+(def ^{:doc "A model that matches and generates keywords without a namespace."}
+  fn-simple-keyword? (-> (h/fn simple-keyword?)
+                         (h/with-test-check-gen gen/keyword)))
 
-(def ^{:doc "A model that matches keywords and generates keywords with a namespace."}
-  fn-keyword-ns? (-> (h/fn keyword?)
-                     (h/with-test-check-gen gen/keyword-ns)))
+(def ^{:doc "A model that matches and generates keywords with a namespace."}
+  fn-qualified-keyword? (-> (h/fn qualified-keyword?)
+                            (h/with-test-check-gen gen/keyword-ns)))
 
 
 

test/minimallist/generator_test.cljc

@@ -5,7 +5,9 @@
             [minimallist.core :refer [valid?]]
             [minimallist.helper :as h]
             [minimallist.util :as util]
-            [minimallist.generator :as mg :refer [gen fn-any? fn-int? fn-string? fn-keyword?]]))
+            [minimallist.generator :as mg :refer [gen fn-any? fn-int? fn-string?
+                                                  fn-symbol? fn-simple-symbol? fn-qualified-symbol?
+                                                  fn-keyword? fn-simple-keyword? fn-qualified-keyword?]]))
 
 (defn- path-test-visitor []
   ;; Testing using side effects.
@@ -338,6 +340,14 @@
 
   (tcg/sample (gen (h/repeat 5 10 fn-int?)))
 
+  (tcg/sample (gen fn-symbol?))
+  (tcg/sample (gen fn-simple-symbol?))
+  (tcg/sample (gen fn-qualified-symbol?))
+
+  (tcg/sample (gen fn-keyword?))
+  (tcg/sample (gen fn-simple-keyword?))
+  (tcg/sample (gen fn-qualified-keyword?))
+
   #__)
 
 (deftest gen-test