Removing the IConvertible interface and fixing the JsonNet converters handling for nulls (#1550)

Removing the `IConvertible` interface and fixing the JsonNet converters
handling for nulls

fixes #1465

Author: lipchev

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -105,7 +105,6 @@ namespace UnitsNet
 #endif
         IComparable,
         IComparable<{_quantity.Name}>,
-        IConvertible,
         IEquatable<{_quantity.Name}>,
         IFormattable");
 
@@ -136,7 +135,6 @@ namespace UnitsNet
             GenerateEqualityAndComparison();
             GenerateConversionMethods();
             GenerateToString();
-            GenerateIConvertibleMethods();
 
             Writer.WL($@"
     }}
@@ -1195,109 +1193,7 @@ public string ToString(string? format, IFormatProvider? provider)
         #endregion
 " );
         }
-
-        private void GenerateIConvertibleMethods()
-        {
-            Writer.WL($@"
-        #region IConvertible Methods
-
-        TypeCode IConvertible.GetTypeCode()
-        {{
-            return TypeCode.Object;
-        }}
-
-        bool IConvertible.ToBoolean(IFormatProvider? provider)
-        {{
-            throw new InvalidCastException($""Converting {{typeof({_quantity.Name})}} to bool is not supported."");
-        }}
-
-        byte IConvertible.ToByte(IFormatProvider? provider)
-        {{
-            return Convert.ToByte(_value);
-        }}
-
-        char IConvertible.ToChar(IFormatProvider? provider)
-        {{
-            throw new InvalidCastException($""Converting {{typeof({_quantity.Name})}} to char is not supported."");
-        }}
-
-        DateTime IConvertible.ToDateTime(IFormatProvider? provider)
-        {{
-            throw new InvalidCastException($""Converting {{typeof({_quantity.Name})}} to DateTime is not supported."");
-        }}
-
-        decimal IConvertible.ToDecimal(IFormatProvider? provider)
-        {{
-            return Convert.ToDecimal(_value);
-        }}
-
-        double IConvertible.ToDouble(IFormatProvider? provider)
-        {{
-            return Convert.ToDouble(_value);
-        }}
-
-        short IConvertible.ToInt16(IFormatProvider? provider)
-        {{
-            return Convert.ToInt16(_value);
-        }}
-
-        int IConvertible.ToInt32(IFormatProvider? provider)
-        {{
-            return Convert.ToInt32(_value);
-        }}
-
-        long IConvertible.ToInt64(IFormatProvider? provider)
-        {{
-            return Convert.ToInt64(_value);
-        }}
-
-        sbyte IConvertible.ToSByte(IFormatProvider? provider)
-        {{
-            return Convert.ToSByte(_value);
-        }}
-
-        float IConvertible.ToSingle(IFormatProvider? provider)
-        {{
-            return Convert.ToSingle(_value);
-        }}
-
-        string IConvertible.ToString(IFormatProvider? provider)
-        {{
-            return ToString(null, provider);
-        }}
-
-        object IConvertible.ToType(Type conversionType, IFormatProvider? provider)
-        {{
-            if (conversionType == typeof({_quantity.Name}))
-                return this;
-            else if (conversionType == typeof({_unitEnumName}))
-                return Unit;
-            else if (conversionType == typeof(QuantityInfo))
-                return {_quantity.Name}.Info;
-            else if (conversionType == typeof(BaseDimensions))
-                return {_quantity.Name}.BaseDimensions;
-            else
-                throw new InvalidCastException($""Converting {{typeof({_quantity.Name})}} to {{conversionType}} is not supported."");
-        }}
-
-        ushort IConvertible.ToUInt16(IFormatProvider? provider)
-        {{
-            return Convert.ToUInt16(_value);
-        }}
-
-        uint IConvertible.ToUInt32(IFormatProvider? provider)
-        {{
-            return Convert.ToUInt32(_value);
-        }}
-
-        ulong IConvertible.ToUInt64(IFormatProvider? provider)
-        {{
-            return Convert.ToUInt64(_value);
-        }}
-
-        #endregion");
-        }
-
+        
         /// <inheritdoc cref="GetObsoleteAttributeOrNull(string)"/>
         private static string? GetObsoleteAttributeOrNull(Quantity quantity) => GetObsoleteAttributeOrNull(quantity.ObsoleteText);
 

CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs

@@ -1092,153 +1092,6 @@ public void ToString_NullProvider_EqualsCurrentCulture(string format)
             Assert.Equal(quantity.ToString(format, CultureInfo.CurrentCulture), quantity.ToString(format, null));
         }}
 
-        [Fact]
-        public void Convert_ToBool_ThrowsInvalidCastException()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Throws<InvalidCastException>(() => Convert.ToBoolean(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToByte_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-           Assert.Equal((byte)quantity.Value, Convert.ToByte(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToChar_ThrowsInvalidCastException()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Throws<InvalidCastException>(() => Convert.ToChar(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToDateTime_ThrowsInvalidCastException()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Throws<InvalidCastException>(() => Convert.ToDateTime(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToDecimal_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((decimal)quantity.Value, Convert.ToDecimal(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToDouble_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((double)quantity.Value, Convert.ToDouble(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToInt16_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((short)quantity.Value, Convert.ToInt16(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToInt32_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((int)quantity.Value, Convert.ToInt32(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToInt64_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((long)quantity.Value, Convert.ToInt64(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToSByte_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((sbyte)quantity.Value, Convert.ToSByte(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToSingle_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((float)quantity.Value, Convert.ToSingle(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToString_EqualsToString()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal(quantity.ToString(), Convert.ToString(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToUInt16_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((ushort)quantity.Value, Convert.ToUInt16(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToUInt32_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((uint)quantity.Value, Convert.ToUInt32(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ToUInt64_EqualsValueAsSameType()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal((ulong)quantity.Value, Convert.ToUInt64(quantity));
-        }}
-
-        [Fact]
-        public void Convert_ChangeType_SelfType_EqualsSelf()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal(quantity, Convert.ChangeType(quantity, typeof({_quantity.Name})));
-        }}
-
-        [Fact]
-        public void Convert_ChangeType_UnitType_EqualsUnit()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal(quantity.Unit, Convert.ChangeType(quantity, typeof({_unitEnumName})));
-        }}
-
-        [Fact]
-        public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal({_quantity.Name}.Info, Convert.ChangeType(quantity, typeof(QuantityInfo)));
-        }}
-
-        [Fact]
-        public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal({_quantity.Name}.BaseDimensions, Convert.ChangeType(quantity, typeof(BaseDimensions)));
-        }}
-
-        [Fact]
-        public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Throws<InvalidCastException>(() => Convert.ChangeType(quantity, typeof(QuantityFormatter)));
-        }}
-
-        [Fact]
-        public void Convert_GetTypeCode_Returns_Object()
-        {{
-            var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0);
-            Assert.Equal(TypeCode.Object, Convert.GetTypeCode(quantity));
-        }}
-
         [Fact]
         public void GetHashCode_Equals()
         {{