Expand types in Unitful test

Author: MilesCranmer

ext/DynamicQuantitiesUnitfulExt.jl

@@ -29,20 +29,22 @@ Base.convert(::Type{Unitful.Quantity}, x::DynamicQuantities.Quantity) =
         cumulator
     end
 
-Base.convert(::Type{DynamicQuantities.Quantity}, x::Unitful.Quantity) =
+Base.convert(::Type{DynamicQuantities.Quantity}, x::Unitful.Quantity{T}) where {T} = convert(DynamicQuantities.Quantity{T,DynamicQuantities.DEFAULT_DIM_TYPE}, x)
+Base.convert(::Type{DynamicQuantities.Quantity{T,R}}, x::Unitful.Quantity) where {T,R} =
     let
         value = Unitful.ustrip(Unitful.upreferred(x))
-        dimension = convert(DynamicQuantities.Dimensions, Unitful.dimension(x))
-        return DynamicQuantities.Quantity(value, dimension)
+        dimension = convert(DynamicQuantities.Dimensions{R}, Unitful.dimension(x))
+        return DynamicQuantities.Quantity(convert(T, value), dimension)
     end
 
-Base.convert(::Type{DynamicQuantities.Dimensions}, d::Unitful.Dimensions{D}) where {D} =
+Base.convert(::Type{DynamicQuantities.Dimensions}, d::Unitful.Dimensions) = convert(DynamicQuantities.Dimensions{DynamicQuantities.DEFAULT_DIM_TYPE}, d)
+Base.convert(::Type{DynamicQuantities.Dimensions{R}}, d::Unitful.Dimensions{D}) where {R,D} =
     let
-        cumulator = DynamicQuantities.Dimensions()
+        cumulator = DynamicQuantities.Dimensions{R}()
         for dim in D
             dim_symbol = _map_dim_name_to_dynamic_units(typeof(dim))
             dim_power = dim.power
-            cumulator *= DynamicQuantities.Dimensions(; dim_symbol => dim_power)
+            cumulator *= DynamicQuantities.Dimensions(R; dim_symbol => dim_power)
         end
         cumulator
     end

test/runtests.jl

@@ -1,9 +1,14 @@
 using SafeTestsets
+import Ratios: SimpleRatio
 
-@safetestset "Unit tests" begin
-    include("unittests.jl")
+@static if !hasmethod(round, Tuple{Int, SimpleRatio{Int}})
+    @eval Base.round(T, x::SimpleRatio) = round(T, x.num // x.den)
 end
 
 @safetestset "Unitful.jl integration tests" begin
-    include("unitful.jl")
+    include("test_unitful.jl")
+end
+
+@safetestset "Unit tests" begin
+    include("unittests.jl")
 end

test/test_unitful.jl

@@ -0,0 +1,19 @@
+import DynamicQuantities
+import Unitful
+import Unitful: @u_str
+import Ratios: SimpleRatio
+import SaferIntegers: SafeInt16
+using Test
+
+# Try to work with different preferred units:
+Unitful.preferunits(u"mA")
+Unitful.preferunits(u"km")
+
+for T in [Float16, Float32, Float64], R in [Rational{Int16}, Rational{Int32}, SimpleRatio{Int}, SimpleRatio{SafeInt16}]
+    x = DynamicQuantities.Quantity(T(0.2), R, length=1, amount=2, current=-1 // 2, luminosity=2 // 5)
+    x_unitful = T(0.2)u"km*mol^2*A^(-1//2)*cd^(2//5)"
+
+    @test convert(Unitful.Quantity, x) ≈ x_unitful
+    @test typeof(convert(DynamicQuantities.Quantity, convert(Unitful.Quantity, x))) <: DynamicQuantities.Quantity{T,DynamicQuantities.DEFAULT_DIM_TYPE}
+    @test convert(DynamicQuantities.Quantity{T,R}, convert(Unitful.Quantity, x)) ≈ x
+end

test/unitful.jl

@@ -4,10 +4,6 @@ using Ratios: SimpleRatio
 using SaferIntegers: SafeInt16
 using Test
 
-@static if !hasmethod(round, Tuple{Int, SimpleRatio{Int}})
-    @eval Base.round(T, x::SimpleRatio) = round(T, x.num // x.den)
-end
-
 @testset "Basic utilities" begin
 
     for T in [Float16, Float32, Float64], R in [Rational{Int16}, Rational{Int32}, SimpleRatio{Int}, SimpleRatio{SafeInt16}]