updated to meet aut-merge reqs

ceferisbarov · Jan 2, 2022 · 2dfb16c · 2dfb16c
1 parent a63d1e6
commit 2dfb16c
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 34 deletions.
diff --git a/Manifest.toml b/Manifest.toml
@@ -3,10 +3,24 @@
 julia_version = "1.7.0"
 manifest_format = "2.0"
 
+[[deps.Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
 [[deps.Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
+[[deps.InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[deps.Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[deps.Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
 [[deps.OrderedCollections]]
 git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
 uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
@@ -22,6 +36,20 @@ version = "0.12.3"
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
+[[deps.Random]]
+deps = ["SHA", "Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[deps.SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[deps.Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[deps.Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
 [[deps.UnPack]]
 git-tree-sha1 = "387c1f73762231e86e0c9c5443ce3b4a0a9a0c2b"
 uuid = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"

diff --git a/Project.toml b/Project.toml
@@ -6,3 +6,8 @@ version = "0.1.0"
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[compat]
+Parameters = "0.12.3"
+julia = "1.7.0"
diff --git a/src/HijriConverter.jl b/src/HijriConverter.jl
@@ -1,4 +1,4 @@
-module core
+module HijriConverter
 # Main module of the hijri-converter package.
 include("ummalqura.jl")
 include("helpers.jl")

diff --git a/test/unit/test_core.jl b/test/unit/test_core.jl
@@ -1,13 +1,13 @@
 module test_core
+
 include("../../src/HijriConverter.jl")
-using .core
 using Test
+using .HijriConverter
 
-
-hijri_obj_1 = core.Hijri(1410, 8, 13)
-hijri_obj_2 = core.Hijri(1460, 4, 21)
-hijri_obj_3 = core.Hijri(1343, 1, 1)
-hijri_obj_4 = core.Hijri(1500, 12, 30)
+hijri_obj_1 = HijriConverter.Hijri(1410, 8, 13)
+hijri_obj_2 = HijriConverter.Hijri(1460, 4, 21)
+hijri_obj_3 = HijriConverter.Hijri(1343, 1, 1)
+hijri_obj_4 = HijriConverter.Hijri(1500, 12, 30)
 
 
 function TestHijri()
@@ -23,8 +23,8 @@ function TestHijri()
 end
 
 function test_equality()
-        @test hijri_obj_1 == core.Hijri(1410, 8, 13)
-        @test hijri_obj_1 != core.Hijri(1410, 8, 14)
+        @test hijri_obj_1 == HijriConverter.Hijri(1410, 8, 13)
+        @test hijri_obj_1 != HijriConverter.Hijri(1410, 8, 14)
         @test hijri_obj_1 != "1410-08-13"
 end
 
@@ -37,14 +37,14 @@ end
 
 
 function test_fromisoformat()
-        @test core.fromisoformat("1410-08-13") == hijri_obj_1
-        @test core.fromisoformat("1460-04-21") == hijri_obj_2
-        @test core.fromisoformat("1343-01-01") == hijri_obj_3
-        @test core.fromisoformat("1500-12-30") == hijri_obj_4
+        @test HijriConverter.fromisoformat("1410-08-13") == hijri_obj_1
+        @test HijriConverter.fromisoformat("1460-04-21") == hijri_obj_2
+        @test HijriConverter.fromisoformat("1343-01-01") == hijri_obj_3
+        @test HijriConverter.fromisoformat("1500-12-30") == hijri_obj_4
 end
 
 function test_today()
-        @test core.to_gregorian(core.hijri_today()) == core.gregorian_today()
+        @test HijriConverter.to_gregorian(HijriConverter.hijri_today()) == HijriConverter.gregorian_today()
 end
 
 function test_year()
@@ -69,58 +69,58 @@ function test_day()
 end
 
 function test_datetuple()
-        @test core.datetuple(hijri_obj_1) == (1410, 8, 13)
+        @test HijriConverter.datetuple(hijri_obj_1) == (1410, 8, 13)
 end
 
 function test_isoformat()
-        @test core.isoformat(hijri_obj_1) == "1410-08-13"
+        @test HijriConverter.isoformat(hijri_obj_1) == "1410-08-13"
 end
 
 function test_dmyformat()
-        @test core.dmyformat(hijri_obj_1) == "13/08/1410"
-        @test core.dmyformat(hijri_obj_1; padding=false) == "13/8/1410"
-        @test core.dmyformat(hijri_obj_1; separator=".") == "13.08.1410"
+        @test HijriConverter.dmyformat(hijri_obj_1) == "13/08/1410"
+        @test HijriConverter.dmyformat(hijri_obj_1; padding=false) == "13/8/1410"
+        @test HijriConverter.dmyformat(hijri_obj_1; separator=".") == "13.08.1410"
 end
 
 function test_month_length()
-        @test core.month_length(hijri_obj_1) == 29
+        @test HijriConverter.month_length(hijri_obj_1) == 29
 end
 
 function test_month_name()
-        @test core.month_name(hijri_obj_1) == "Sha’ban"
-        @test core.month_name(hijri_obj_1, "en") == "Sha’ban"
-        @test core.month_name(hijri_obj_1, "en-US") == "Sha’ban"
+        @test HijriConverter.month_name(hijri_obj_1) == "Sha’ban"
+        @test HijriConverter.month_name(hijri_obj_1, "en") == "Sha’ban"
+        @test HijriConverter.month_name(hijri_obj_1, "en-US") == "Sha’ban"
 end
 
 function test_weekday()
-        @test core.weekday(hijri_obj_1) == 5
+        @test HijriConverter.weekday(hijri_obj_1) == 5
 end
 
 function test_iso_weekday()
-        @test core.isoweekday(hijri_obj_1) == 6
+        @test HijriConverter.isoweekday(hijri_obj_1) == 6
 end
 
 function test_day_name()
-        @test core.day_name(hijri_obj_1) == "Saturday"
-        @test core.day_name(hijri_obj_1, "en") == "Saturday"
-        @test core.day_name(hijri_obj_1, "en-US") == "Saturday"
+        @test HijriConverter.day_name(hijri_obj_1) == "Saturday"
+        @test HijriConverter.day_name(hijri_obj_1, "en") == "Saturday"
+        @test HijriConverter.day_name(hijri_obj_1, "en-US") == "Saturday"
 end
 
 function test_notation()
-        @test core.notation(hijri_obj_1) == "AH"
-        @test core.notation(hijri_obj_1, "en") == "AH"
-        @test core.notation(hijri_obj_1, "en-US") == "AH"
+        @test HijriConverter.notation(hijri_obj_1) == "AH"
+        @test HijriConverter.notation(hijri_obj_1, "en") == "AH"
+        @test HijriConverter.notation(hijri_obj_1, "en-US") == "AH"
 end
 
 function test_to_julian()
-        @test core.to_julian(hijri_obj_1) == 2447961
+        @test HijriConverter.to_julian(hijri_obj_1) == 2447961
 end
 
 function test_to_gregorian()
-        @test core.datetuple(core.to_gregorian(hijri_obj_1)) == (1990, 3, 10)
+        @test HijriConverter.datetuple(HijriConverter.to_gregorian(hijri_obj_1)) == (1990, 3, 10)
 end
 
 function test_month_index()
-        @test core._month_index(hijri_obj_1) == 811
+        @test HijriConverter._month_index(hijri_obj_1) == 811
 end
 end