more tests

src/datetime.jl

@@ -204,7 +204,7 @@ end
 
 function units(dt::AbstractCFDateTime{T,Torigintuple}) where {T,Torigintuple}
     return string(units(dt.instant)," since ",
-                  datetuple_to_string(unwrap(Torigintuple)))
+                  format_datetuple(unwrap(Torigintuple)))
 end
 
 +(dt::AbstractCFDateTime,p::Union{Dates.TimePeriod,Dates.Day}) = dt + convert(CFTime.Period,p)
@@ -253,7 +253,7 @@ function chop0(timetuple,minlen=0)
     end
 end
 
-function datetuple_to_string(timetuple::Tuple)
+function format_datetuple(timetuple::Tuple)
     y,mo,d,rest... = pad_ymd(timetuple)
 
     io = IOBuffer()
@@ -287,7 +287,7 @@ end
 
 
 function string(dt::T)  where T <: AbstractCFDateTime
-    return datetuple_to_string(chop0(datetuple(dt),6))
+    return format_datetuple(chop0(datetuple(dt),6))
 end
 
 function show(io::IO,dt::T)  where T <: AbstractCFDateTime

src/period.jl

@@ -208,7 +208,7 @@ function units(p::Period{T,Tfactor,Texponent}) where {T,Tfactor,Texponent}
         end
     end
 
-    return string(unwrap(factor)," × 10^",unwrap(exponent)," s")
+    return string(unwrap(Tfactor)," × 10^",unwrap(Texponent)," s")
 end
 
 
@@ -244,11 +244,15 @@ end
     Dates.Millisecond(Int64(p.duration))
 
 @inline function Dates.Millisecond(p::Period)
-    Dates.Millisecond(convert(CFTime.Period{Int64,Val{1}(),Val{-3}()},p))
+    Dates.Millisecond(convert(Period{Int64,Val{1}(),Val{-3}()},p))
 end
 
 @inline function Dates.Second(p::Period)
-    Dates.Second(convert(CFTime.Period{Int64,Val{1}(),Val{0}()},p))
+    Dates.Second(convert(Period{Int64,Val{1}(),Val{0}()},p))
+end
+
+@inline function Dates.Second(p::Period{T,Val{1}(),Val{0}()}) where T
+    Dates.Second(p.duration)
 end
 
 function isless(p1::Period,p2::Period)

test/test_resolution.jl

@@ -93,11 +93,15 @@ show(io,p1)
 str = String(take!(io))
 @test occursin("1 second",str)
 @test occursin("1 second",string(p1))
+@test occursin("second",CFTime.units(p1))
+@test Dates.Second(p1) === Dates.Second(1)
+@test Dates.Millisecond(p1) === Dates.Millisecond(1000)
 
 # unknown Period
 p1 = Period(1000,1,-21) # 1000 zeptosecond = 1 attosecond
 @test p1 == Period(1,:attosecond)
 @test occursin("-21",string(p1))
+@test occursin("-21",CFTime.units(p1))
 
 # decode dates