Add the CHANGELOG.

CHANGELOG.md

@@ -0,0 +1,127 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.5.3] - 2023-10-05
+
+### Added
+- Add the CHANGELOG.
+
+## [0.5.2] - 2023-10-02
+
+### Fixed
+- Fix checking for file existence only when the options are set.
+- Fix writing to a file only when the option is set.
+
+## [0.5.1] - 2023-09-28
+
+### Added
+- Add the output option to save into a file.
+- Add the file errors to prevent using an invalid file path.
+
+## [0.5.0] - 2023-09-22
+
+### Changed
+- Update symbol defaults, factories to have only lower alphabets.
+- Update the Caesar to be case-insensitive and skip unknown symbols.
+- Update Caesar Analyzers to be case-insensitive and testable.
+
+## [0.4.3] - 2023-09-21
+
+### Added
+- Add the language option for symbols.
+
+### Changed
+- Update the CLI to have separated actions and an option initializer.
+
+## [0.4.2] - 2023-09-18
+
+### Added
+- Add tests for the cipher-analyzers module.
+
+### Changed
+- Rename the cipher_analyzer module to cipher-analyzers.
+
+## [0.4.1] - 2023-09-17
+
+### Added
+- Add symbol factories for punctuation, space, defaults symbols.
+- Add the action-type to distinguish the actions.
+- Add the symbol option and its default.
+- Add the cracking option.
+
+### Changed
+- Rename the language_analyzer module to language-analyzer.
+- Update the nonsense for the is-nonsense? test.
+- Rename the symbol_frequences module to symbol-frequences.
+
+## [0.4.0] - 2023-09-15
+
+### Added
+- Add Chi-squared Statistic function to analyze texts.
+- Add the caesar-analyzers to get the plaintext from a ciphertext.
+
+## [0.3.5] - 2023-09-14
+
+### Added
+- Add the frequences of symbols as defaults.
+
+## [0.3.4] - 2023-09-13
+
+### Added
+- Add a simple language analyzers.
+
+## [0.3.3] - 2023-09-12
+
+### Added
+- Add an option to read a message from a file.
+
+## [0.3.2] - 2023-09-11
+
+### Added
+- Add the CI/CD configuration.
+
+## [0.3.1] - 2023-09-11
+
+### Added
+- Add factories for symbols.
+- Add tests for factories.
+
+## [0.3.0] - 2023-09-10
+
+### Added
+- Add a simple cli interface.
+
+## [0.2.0] - 2023-09-09
+
+### Added
+- Add a implementation of Caesar cipher.
+
+## [0.1.0] - 2023-09-09
+
+### Added
+- Project initialization.
+
+[Unreleased]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.5.3...main?from_project_id=50218541&straight=false
+[0.5.3]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.5.2...0.5.3?from_project_id=50218541&straight=false
+[0.5.2]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.5.1...0.5.2?from_project_id=50218541&straight=false
+[0.5.1]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.5.0...0.5.1?from_project_id=50218541&straight=false
+[0.5.0]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.4.3...0.5.0?from_project_id=50218541&straight=false
+[0.4.3]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.4.2...0.4.3?from_project_id=50218541&straight=false
+[0.4.2]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.4.1...0.4.2?from_project_id=50218541&straight=false
+[0.4.1]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.4.0...0.4.1?from_project_id=50218541&straight=false
+[0.4.0]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.3.5...0.4.0?from_project_id=50218541&straight=false
+[0.3.5]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.3.4...0.3.5?from_project_id=50218541&straight=false
+[0.3.4]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.3.3...0.3.4?from_project_id=50218541&straight=false
+[0.3.3]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.3.2...0.3.3?from_project_id=50218541&straight=false
+[0.3.2]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.3.1...0.3.2?from_project_id=50218541&straight=false
+[0.3.1]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.3.0...0.3.1?from_project_id=50218541&straight=false
+[0.3.0]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.2.0...0.3.0?from_project_id=50218541&straight=false
+[0.2.0]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/compare/0.1.0...0.2.0?from_project_id=50218541&straight=false
+[0.1.0]: https://gitlab.com/KKlochko/cipher-analytical-machine/-/commit/a7a715b94276fc8f46fb6a44139636d27b551599
+

src/cipher_analytical_machine/caesar.clj

@@ -14,21 +14,28 @@
        (+ key)
        (mod max-index)))
 
+(defn encrypt-or-skip
+  "If symbols do not have a character, then it will be skipped."
+  [index character key symbols max-index]
+  (if (nil? index) character
+      (get symbols
+           (encrypt-index index key max-index))))
+
 (defn encrypt-char
   "Calculates new index of a character. Uses a char from symbols, the key and max-index (exclusive)."
   [char key symbols max-index]
-  (get symbols
-       (-> char
-           (calculate-char-index symbols)
-           (encrypt-index key max-index))))
+  (-> char
+      (calculate-char-index symbols)
+      (encrypt-or-skip char key symbols max-index)))
 
 (defn encrypt-message
-  "Encrypt a message using the Caesar cipher."
+  "Encrypt a message using the Caesar cipher. The function is case-insensitive."
   [message key symbols]
   (let [max-index (count symbols)]
-    (cs/join
-     (map (fn [char] (encrypt-char char key symbols max-index))
-          message))))
+    (->> message
+         (cs/lower-case)
+         (map (fn [char] (encrypt-char char key symbols max-index)))
+         (cs/join))))
 
 (defn decrypt-message
   "Decrypt the ciphtext using the Caesar cipher."

src/cipher_analytical_machine/caesar_analyzers.clj

@@ -0,0 +1,48 @@
+(ns cipher-analytical-machine.caesar-analyzers
+  (:require [cipher-analytical-machine.caesar :as caesar]
+            [clojure.string :as cs]
+            [cipher-analytical-machine.cipher-analyzers :as ca])
+  (:gen-class))
+
+(defn get-all-texts
+  "Return a list of pairs which have a key and a second posible plaintext."
+  [ciphertext symbols]
+  (let [keys (range (count symbols))]
+    (reduce
+     (fn [acc key]
+       (conj acc [key (caesar/decrypt-message ciphertext key symbols)]))
+     '() keys)))
+
+(defn get-all-scores
+  "For pairs (key, plaintext) finds scores and return list of pairs [key, score]."
+  [letter-frequences pairs]
+  (map (fn [[key text]]
+         [key (ca/chi-squared-statistic text letter-frequences)])
+       pairs))
+
+(defn get-min-score-pair
+  "For pairs (key, plaintext) finds scores and return list of pairs [key, score]."
+  [pairs]
+  (reduce
+   (fn [[key value] [new-key new-value]]
+     (if (> value new-value) [new-key new-value]
+         [key value]))
+   [0 Double/MAX_VALUE]
+   pairs))
+
+(defn get-key
+  "To find the key with frequencies of letters."
+  [ciphertext symbols letter-frequences]
+  (->> (get-all-texts ciphertext symbols)
+       (get-all-scores letter-frequences)
+       (get-min-score-pair)
+       (first)))
+
+(defn get-plaintext
+  "Return the plaintext from a ciphertext. The function is case-insensitive."
+  [ciphertext symbols letter-frequences]
+  (let [ciphertext (cs/lower-case ciphertext)]
+    (caesar/decrypt-message ciphertext
+                            (get-key ciphertext symbols letter-frequences)
+                            symbols)))
+

src/cipher_analytical_machine/cipher_analyzers.clj

@@ -0,0 +1,38 @@
+(ns cipher-analytical-machine.cipher-analyzers
+  (:require [clojure.string :as cs])
+  (:gen-class))
+
+(defn count-characters
+  "Count the letters and return map."
+  [text]
+  (reduce
+   (fn [acc val]
+     (assoc acc val
+            (inc (get acc val 0))))
+   {} text))
+
+(defn chi-squared-letter-statistic
+  "To calculate the frequency distribution of a letter."
+  [letter-count letter-frequence length-text]
+  (let [letter-frequence (* length-text letter-frequence)]
+    (/ (Math/pow
+        (- letter-count letter-frequence) 2)
+       letter-frequence)))
+
+(defn chi-squared-statistic
+  "To calculate the frequency distribution of a language. More detail about the algorithm here: http://practicalcryptography.com/cryptanalysis/text-characterisation/chi-squared-statistic/"
+  [text letter-frequences]
+  (let [length-text (count text)
+        letter-counts (count-characters (cs/lower-case text))]
+    ;letter-counts
+    (reduce
+     (fn [acc [char count]]
+       (+ acc
+          (if (contains? letter-frequences char)
+            (chi-squared-letter-statistic count
+                                          (get letter-frequences char)
+                                          length-text)
+            0)))
+            0
+            letter-counts)))
+

src/cipher_analytical_machine/cli.clj

@@ -2,6 +2,9 @@
   (:require
    [cipher-analytical-machine.file :as file]
    [cipher-analytical-machine.caesar :as caesar]
+   [cipher-analytical-machine.caesar-analyzers :as caesar-analyzers]
+   [cipher-analytical-machine.symbol-factories :as sf]
+   [cipher-analytical-machine.symbol-frequences :as symbol-frequences]
    [clojure.string :as cs]
    [clojure.tools.cli :refer [parse-opts]])
   (:gen-class))
@@ -9,6 +12,9 @@
 (def cipher-options
   #{"Caesar"})
 
+(def language-options
+  #{"en", "uk"})
+
 (def cli-options
   [["-m" "--message MESSAGE" "The message will be encrypted or decrypted."]
    ["-M" "--message-file MESSAGE-FILE" "The file contains the message that will be encrypted or decrypted."]
@@ -17,6 +23,12 @@
     :default "Caesar"]
    ["-e" "--encrypt" "Encrypt the message."]
    ["-d" "--decrypt" "Decrypt the message."]
+   ["-s" "--symbols" "The string will be used as a set of symbols for a cipher."
+    :default (sf/default-symbol-factory "en")]
+   ["-l" "--language CODE" "The string will be used to set a default symbols for a cipher."
+    :validate [#(contains? language-options %) "Must be a code from the list: en, uk!!!"]]
+   ["-C" "--cracking" "Cracking the encrypted message."]
+   ["-O" "--output-file OUTPUT-FILE" "Save the program output to a file."]
    ["-h" "--help"]])
 
 (defn usage [options-summary]
@@ -57,12 +69,30 @@
       (map-has-keys? options [:message, :message-file])
       {:exit-message (error-msg ["You can't use message and message-file options at the same time!!!"])}
 
+      (and (contains? options :message-file)
+           (file/is-file-not-exists? (:message-file options)))
+      {:exit-message (error-msg ["Please, check the path to the message file!!!"])}
+
+      (and (contains? options :output-file)
+           (file/is-file-exists? (:output-file options)))
+      {:exit-message (error-msg ["Please, choose another file!!! Overwriting was prevented!!!"])}
+
       (and (map-has-keys? options [:cipher, :key])
            (or (contains? options :message)
                (contains? options :message-file))
            (or (contains? options :encrypt)
                (contains? options :decrypt)))
-      {:options options :arguments arguments}
+      (cond
+        (contains? options :encrypt)
+        {:options options :arguments arguments :action-type :encrypt}
+
+        (contains? options :decrypt)
+        {:options options :arguments arguments :action-type :decrypt})
+
+      (and (map-has-keys? options [:cipher, :cracking])
+           (or (contains? options :message)
+               (contains? options :message-file)))
+      {:options options :arguments arguments :action-type :cracking}
 
       :else
       {:exit-message (usage summary)})))
@@ -72,27 +102,87 @@
   (println exit-message)
   (System/exit (if status 0 1)))
 
-(defn get-message
-  "Return the message"
-  [options arguments]
-  (cond
-    (contains? options :message)
-    (:message options)
+(defn get-or-load-option
+  "Return the option value or load the value from a file."
+  [options arguments option]
+  (let [file-option (keyword (str (name option) "-file"))]
+    (cond
+      (contains? options option)
+      (option options)
 
-    (contains? options :message-file)
-    (file/read-file (:message-file options))))
+      (contains? options file-option)
+      (file/read-file (file-option options)))))
+
+(defn set-option
+  "Set a option in the option map."
+  [options option value]
+  (-> options
+      (assoc option value)))
+
+(defn set-symbols
+  "Set defaults symbols for a language."
+  [options]
+  (set-option options :symbols
+              (sf/default-symbol-factory (:language options))))
+
+(defn load-and-set-option
+  "Load the option and set it."
+  [options option]
+  (->> (get-or-load-option options nil option)
+       (set-option options option)))
+
+(defn load-all-options
+  "Load all options."
+  [options]
+  (-> options
+      (set-symbols)
+      (load-and-set-option :message)))
+
+(defn save-output
+  "Save the output to a file"
+  [output options]
+  (let [file-path (:output-file options)]
+    (file/write-file file-path output)))
+
+(defn show-and-save-output
+  "Print and save the output to a file if needed"
+  [output options]
+  (when (contains? options :output-file)
+    (save-output output options))
+  (println output))
+
+(defn cracking-actions
+  [options arguments action-type]
+  (let [message (:message options)
+        symbols (:symbols options)
+        frequencies symbol-frequences/english-letter-frequences]
+    (cond
+      (= action-type :cracking)
+      (caesar-analyzers/get-plaintext message symbols frequencies)
+      )))
+
+(defn crypt-actions
+  [options arguments action-type]
+  (let [message (:message options)
+        key (Integer/parseInt (:key options))
+        symbols (:symbols options)]
+    (cond
+      (= action-type :encrypt)
+      (caesar/encrypt-message message key symbols)
+
+      (= action-type :decrypt)
+      (caesar/decrypt-message message key symbols))))
 
 (defn actions
-  [options arguments]
-  (println (str options arguments))
-  (let [message (get-message options arguments)
-        key (Integer/parseInt (:key options))
-        symbols "abc"]
-    (println
+  [options arguments action-type]
+  (let [options (load-all-options options)]
+    (->
      (cond
-       (contains? options :encrypt)
-       (caesar/encrypt-message message key symbols)
+       (contains? #{:encrypt :decrypt} action-type)
+       (crypt-actions options arguments action-type)
 
-       (contains? options :decrypt)
-       (caesar/decrypt-message message key symbols)))))
+       (= action-type :cracking)
+       (cracking-actions options arguments action-type))
+
+     (show-and-save-output options))))
 

src/cipher_analytical_machine/core.clj

@@ -5,8 +5,8 @@
 
 (defn -main
   [& args]
-  (let [{:keys [options arguments exit-message ok?]} (cli/validate-args args)]
+  (let [{:keys [options arguments action-type exit-message ok?]} (cli/validate-args args)]
     (if exit-message
       (cli/exit exit-message ok?)
-      (cli/actions options arguments))))
+      (cli/actions options arguments action-type))))
 

src/cipher_analytical_machine/file.clj

@@ -16,3 +16,6 @@
 (defn read-file [file-path]
   (slurp file-path))
 
+(defn write-file [file-path content]
+  (spit file-path content))
+

src/cipher_analytical_machine/language_analyzer.clj

@@ -1,4 +1,4 @@
-(ns cipher-analytical-machine.language_analyzer
+(ns cipher-analytical-machine.language-analyzer
   (:import [org.apache.tika.language LanguageIdentifier])
   (:gen-class))
 

src/cipher_analytical_machine/symbol_factories.clj

@@ -1,8 +1,8 @@
-(ns cipher-analytical-machine.symbol_factories
+(ns cipher-analytical-machine.symbol-factories
   (:require [clojure.string :as cs])
   (:gen-class))
 
-(defn lower-english-alphabet-factory
+(defn english-alphabet-factory
   "Return the English alphabet with only lowercase letters"
   []
   (reduce
@@ -10,25 +10,38 @@
    ""
    (range (int \a) (inc (int \z)))))
 
-(defn english-alphabet-factory
-  "Return the English alphabet with lower and upper case letters"
-  []
-  (let [letters (lower-english-alphabet-factory)]
-    (str letters (cs/upper-case letters))))
-
-(defn lower-ukrainian-alphabet-factory
+(defn ukrainian-alphabet-factory
   "Return the Ukrainian alphabet with only lowercase letters"
   []
   "абвгґдеєжзиіїйклмнопрстуфхцчшщьюя")
 
-(defn ukrainian-alphabet-factory
-  "Return the Ukrainian alphabet with lower and upper case letters"
-  []
-  (let [letters (lower-ukrainian-alphabet-factory)]
-    (str letters (cs/upper-case letters))))
-
 (defn digit-set-factory
   "Return digits"
   []
   "0123456789")
 
+(defn punctuation-symbol-factory
+  "Return punctuation symbols"
+  []
+  ".,:;-!?")
+
+(defn space-symbol-factory
+  "Return punctuation symbols"
+  []
+  " \t\n")
+
+(defn default-symbol-factory
+  "Return a default string of symbols for a language"
+  [language-code]
+  (cond
+    (= language-code "en")
+    (str (english-alphabet-factory)
+         \ )
+
+    (= language-code "uk")
+    (str (ukrainian-alphabet-factory)
+         \ )
+
+    :else
+    (default-symbol-factory "en")))
+

src/cipher_analytical_machine/symbol_frequences.clj

@@ -1,4 +1,4 @@
-(ns cipher-analytical-machine.symbol_frequences
+(ns cipher-analytical-machine.symbol-frequences
   (:gen-class))
 
 (def english-letter-frequences {

test/cipher_analytical_machine/caesar_analyzers_test.clj

@@ -0,0 +1,76 @@
+(ns cipher-analytical-machine.caesar-analyzers-test
+  (:require
+   [clojure.test :refer :all]
+   [cipher-analytical-machine.caesar-analyzers :refer :all]
+   [cipher-analytical-machine.symbol-frequences :as sf]
+   [cipher-analytical-machine.cipher-analyzers :as ca]
+   [clojure.string :as cs]))
+
+(deftest get-all-texts-test
+  (testing "There're three text when the text is 'abc' and the set of symbol is 'abc'."
+    (is (= 3 (count (get-all-texts "abc" "abc")))))
+
+  (testing "A pair must have an integer and a string."
+    (let [pairs (get-all-texts "abc" "abc")
+          pair (first pairs)]
+      (is (and (int? (first pair))
+               (string? (last pair))))))
+
+  (testing "There're 27 combinations for a 'Hello World'."
+    (let [ciphertext "khoorczruog"
+        symbols "abcdefghijklmnopqrstuvwxyz "]
+      (is (= 27 (count (get-all-texts ciphertext symbols)))))))
+
+(deftest get-all-scores-test
+  (testing "There're 27 combinations for a 'Hello World'."
+    (let [ciphertext "khoorczruog"
+          symbols "abcdefghijklmnopqrstuvwxyz "
+          frequences sf/english-letter-frequences
+          text-pairs (get-all-texts ciphertext symbols)]
+      (is (= 27 (count (get-all-scores frequences text-pairs)))))))
+
+(deftest get-min-score-pair-test
+  (testing "If a key is one, then the min score pair is 15."
+    (let [scores (list [0 20.0] [1 15.0] [2 30.0])
+          min-score-pair (get-min-score-pair scores)]
+      (is (= [1 15.0] min-score-pair)))))
+
+(deftest get-key-test
+  (let [plaintext "hello world"
+        ciphertext "khoorczruog"
+        key 3
+        symbols "abcdefghijklmnopqrstuvwxyz "
+        frequences sf/english-letter-frequences]
+    (testing "The plaintext is encrypted with 3 as the key."
+      (is (= key (get-key ciphertext symbols frequences)))))
+
+  (let [; З поеми "Кавказ" Тараса Григоровича Шевченка:
+        plaintext "Борітеся – поборете, Вам Бог помагає! За вас правда, за вас слава. І воля святая!"
+        ciphertext "жхчощйшде–ецхжхчйщй,езєуежхиецхуєиєк!емєезєшецчєзїє,емєезєшештєзє.еоезхтдешздщєд!"
+        key 7
+        symbols "абвгґдеєжзиіїйклмнопрстуфхцчшщьюя "
+        frequences sf/ukrainian-letter-frequences]
+    (testing "The plaintext is encrypted with 3 as the key."
+      (is (= key (get-key ciphertext symbols frequences))))))
+
+(deftest get-plaintext-test
+  (let [plaintext "hello world"
+        ciphertext "khoorczruog"
+        symbols "abcdefghijklmnopqrstuvwxyz "
+        frequences sf/english-letter-frequences]
+    (testing "The plaintext is encrypted with 3 as the key."
+      (is (= plaintext (get-plaintext ciphertext symbols frequences))))
+
+    (testing "The ciphertext is case-insensitive."
+      (is (= plaintext (get-plaintext "KhoorcZruog" symbols frequences)))))
+
+  (let [; З поеми "Кавказ" Тараса Григоровича Шевченка:
+        plaintext "Борітеся – поборете, Вам Бог помагає! За вас правда, за вас слава. І воля святая!"
+        ciphertext "жхчощйшде–ецхжхчйщй,езєуежхиецхуєиєк!емєезєшецчєзїє,емєезєшештєзє.еоезхтдешздщєд!"
+        key 7
+        symbols "абвгґдеєжзиіїйклмнопрстуфхцчшщьюя "
+        frequences sf/ukrainian-letter-frequences]
+    (testing "The ciphertext is case-insensitive."
+      (is (= (cs/lower-case plaintext)
+             (get-plaintext ciphertext symbols frequences))))))
+

test/cipher_analytical_machine/caesar_test.clj

@@ -51,14 +51,20 @@
     (testing "The message 'abc' is encrypted to 'bca'"
       (is (= "bca" (encrypt-message "abc" 1 symbols))))
 
+    (testing "The message 'ABC' is encrypted to 'bca', because of case-insensitive."
+      (is (= "bca" (encrypt-message "ABC" 1 symbols))))
+
     (testing "The message 'bca' is decrypted to 'abc'"
       (is (= "abc" (encrypt-message "bca" -1 symbols))))))
 
 (deftest decrypt-message-text
   (let [symbols "abc"]
     (testing "The message 'bca' is decrypted to 'abc'"
-      (is (= "abc" (decrypt-message "bca" 1 symbols)))
+      (is (= "abc" (decrypt-message "bca" 1 symbols))))
+
+    (testing "The message 'BCA' is decrypted to 'abc', because of case-insensitive."
+      (is (= "abc" (decrypt-message "BCA" 1 symbols))))
 
     (testing "The message 'abc' is encrypted to 'bca'"
-      (is (= "bca" (decrypt-message "abc" -1 symbols)))))))
+      (is (= "bca" (decrypt-message "abc" -1 symbols))))))
 

test/cipher_analytical_machine/cipher_analyzers_test.clj

@@ -0,0 +1,25 @@
+(ns cipher-analytical-machine.cipher-analyzers-test
+  (:require
+   [clojure.test :refer :all]
+   [cipher-analytical-machine.cipher-analyzers :refer :all]))
+
+(deftest count-characters-test
+  (testing "Count two dublicates and one uniq character from a string."
+    (is (= {\a 2 \b 1}
+           (count-characters "aba")))))
+
+(deftest chi-squared-letter-statistic-test
+  (testing "If the frequence of A is 0.1, the text length is 100 and contains 20 times, then the chi-squared is 10."
+    (is (= 10.0
+           (chi-squared-letter-statistic 20 0.1 100))))
+
+  (testing "If the frequence of A is 0.1, the text length is 10 and contains 5 times, then the chi-squared is 16.0."
+    (is (= 16.0
+           (chi-squared-letter-statistic 5 0.1 10)))))
+
+(deftest chi-squared-statistic-test
+  (let [text "aaaaabbbbb"]
+  (testing "If the frequences of a and b is 0.1, the text length is 10 and contains them 5 times, then score is 32."
+    (is (= 32.0
+           (chi-squared-statistic text {\a 0.1 \b 0.1}))))))
+

test/cipher_analytical_machine/language_analyzer_test.clj

@@ -1,7 +1,7 @@
-(ns cipher-analytical-machine.language_analyzer_test
+(ns cipher-analytical-machine.language-analyzer-test
   (:require
    [clojure.test :refer :all]
-   [cipher-analytical-machine.language_analyzer :refer :all]
+   [cipher-analytical-machine.language-analyzer :refer :all]
   ))
 
 (deftest detect-language-test
@@ -41,5 +41,5 @@
     (is (is-nonsense? "dfgjldfjgdfl gjdfg idfjig hdgesr khs e." "en")))
 
   (testing "Checking a gibberish that uses Ukrainian letters"
-    (is (is-nonsense? "іаврпшшцді врадів аргів аріл варї йцґ." "uk"))))
+    (is (is-nonsense? "іаврпшшцді івафі лоінїмч йцувіа івапґ." "uk"))))
 

test/cipher_analytical_machine/symbol_factories_test.clj

@@ -1,46 +1,59 @@
 (ns cipher-analytical-machine.symbol-factories-test
   (:require
    [clojure.test :refer :all]
-   [cipher-analytical-machine.symbol_factories :refer :all]
+   [cipher-analytical-machine.symbol-factories :refer :all]
   ))
 
-(deftest lower-english-alphabet-factory-test
-  (let [symbols (lower-english-alphabet-factory)]
-    (testing "It must have same order"
-      (is (= "abcdefghijklmnopqrstuvwxyz" symbols)))
-
-    (testing "It must have 26 letters"
-      (is (= 26 (count symbols))))))
-
 (deftest english-alphabet-factory-test
   (let [symbols (english-alphabet-factory)]
-    (testing "It must have same order"
-      (is (= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" symbols)))
+    (testing "It must have the same order."
+      (is (= "abcdefghijklmnopqrstuvwxyz" symbols)))
 
-    (testing "It must have 2*26 letters"
-      (is (= (* 2 26) (count symbols))))))
-
-(deftest lower-ukrainian-alphabet-factory-test
-  (let [symbols (lower-ukrainian-alphabet-factory)]
-    (testing "It must have same order"
-      (is (= "абвгґдеєжзиіїйклмнопрстуфхцчшщьюя" symbols)))
-
-    (testing "It must have 33 letters"
-      (is (= 33 (count symbols))))))
+    (testing "It must have 26 letters."
+      (is (= 26 (count symbols))))))
 
 (deftest ukrainian-alphabet-factory-test
   (let [symbols (ukrainian-alphabet-factory)]
-    (testing "It must have same order"
-      (is (= "абвгґдеєжзиіїйклмнопрстуфхцчшщьюяАБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯ" symbols)))
+    (testing "It must have the same order."
+      (is (= "абвгґдеєжзиіїйклмнопрстуфхцчшщьюя" symbols)))
 
-    (testing "It must have 2*33 letters"
-      (is (= (* 2 33) (count symbols))))))
+    (testing "It must have 33 letters."
+      (is (= 33 (count symbols))))))
 
 (deftest digit-set-factory-test
   (let [symbols (digit-set-factory)]
-    (testing "It must have same order"
+    (testing "It must have the same order."
       (is (= "0123456789" symbols)))
 
-    (testing "It must have 10 digits"
+    (testing "It must have 10 digits."
       (is (= 10 (count symbols))))))
 
+(deftest punctuation-symbol-factory-test
+  (let [symbols (punctuation-symbol-factory)]
+    (testing "It must have the same order."
+      (is (= ".,:;-!?" symbols)))
+
+    (testing "It must have 7 symbols."
+      (is (= 7 (count symbols))))))
+
+(deftest space-symbol-factory-test
+  (let [symbols (space-symbol-factory)]
+    (testing "It must have the same order."
+      (is (= " \t\n" symbols)))
+
+    (testing "It must have 3 symbols."
+      (is (= 3 (count symbols))))))
+
+(deftest default-symbol-factory-test
+  (testing "If language code is 'en', then it must have 27 symbols."
+    (let [symbols (default-symbol-factory "en")]
+      (is (= 27 (count symbols)))))
+
+  (testing "If language code is 'uk', then it must have 34 symbols."
+    (let [symbols (default-symbol-factory "uk")]
+      (is (= 34 (count symbols)))))
+
+  (testing "If language code is unidentified, then it must have the 'en'."
+    (let [symbols (default-symbol-factory "Maybe a code")]
+      (is (= 27 (count symbols))))))
+