Skip to content

Commit 772206a

Browse files
MuximizeMuximize
committed
Fix other tests
1 parent d21d06c commit 772206a

File tree

7 files changed

+61
-61
lines changed

7 files changed

+61
-61
lines changed

‎UnitsNet.Serialization.JsonNet.Tests/AbbreviatedUnitsConverterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public void DoubleQuantity_SerializedWithDoubleValueAndAbbreviatedUnit()
2828
[Fact]
2929
public void InterfaceObject_IncludesTypeInformation()
3030
{
31-
var testObject = new TestInterfaceObject { Quantity = new Information(1.20m, InformationUnit.Exabyte) };
32-
var expectedJson = "{\"Quantity\":{\"Value\":1.20,\"Unit\":\"EB\",\"Type\":\"Information\"}}";
31+
var testObject = new TestInterfaceObject { Quantity = new Information(1.2, InformationUnit.Exabyte) };
32+
var expectedJson = "{\"Quantity\":{\"Value\":1.2,\"Unit\":\"EB\",\"Type\":\"Information\"}}";
3333

3434
var json = SerializeObject(testObject);
3535

‎UnitsNet.Serialization.JsonNet.Tests/UnitsNetJsonSerializationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed class UnitsNetJsonSerializationTests : UnitsNetJsonBaseTest
1212
public void Information_CanSerializeVeryLargeValues()
1313
{
1414
Information i = Information.FromExabytes(1E+9);
15-
var expectedJson = "{\n \"Unit\": \"InformationUnit.Exabyte\",\n \"Value\": 1000000000.0,\n \"ValueString\": \"1000000000\",\n \"ValueType\": \"decimal\"\n}";
15+
var expectedJson = "{\n \"Unit\": \"InformationUnit.Exabyte\",\n \"Value\": 1000000000.0\n}";
1616

1717
string json = SerializeObject(i);
1818

@@ -34,7 +34,7 @@ public void Mass_ExpectConstructedValueAndUnit()
3434
public void Information_ExpectConstructedValueAndUnit()
3535
{
3636
Information quantity = Information.FromKilobytes(54);
37-
var expectedJson = "{\n \"Unit\": \"InformationUnit.Kilobyte\",\n \"Value\": 54.0,\n \"ValueString\": \"54\",\n \"ValueType\": \"decimal\"\n}";
37+
var expectedJson = "{\n \"Unit\": \"InformationUnit.Kilobyte\",\n \"Value\": 54.0\n}";
3838

3939
string json = SerializeObject(quantity);
4040

‎UnitsNet.Tests/CustomCode/BitRateTests.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,37 @@ public class BitRateTests : BitRateTestsBase
2929
{
3030
protected override bool SupportsSIUnitSystem => false;
3131

32-
protected override decimal BitsPerSecondInOneBitPerSecond => 1m;
33-
protected override decimal BytesPerSecondInOneBitPerSecond => 1.25E-1m;
32+
protected override double BitsPerSecondInOneBitPerSecond => 1;
33+
protected override double BytesPerSecondInOneBitPerSecond => 1.25E-1;
3434

35-
protected override decimal KilobitsPerSecondInOneBitPerSecond => 1E-3m;
36-
protected override decimal KilobytesPerSecondInOneBitPerSecond => 1.25E-4m;
37-
protected override decimal KibibitsPerSecondInOneBitPerSecond => 0.0009765625m;
38-
protected override decimal KibibytesPerSecondInOneBitPerSecond => 0.0001220703125m;
35+
protected override double KilobitsPerSecondInOneBitPerSecond => 1E-3;
36+
protected override double KilobytesPerSecondInOneBitPerSecond => 1.25E-4;
37+
protected override double KibibitsPerSecondInOneBitPerSecond => 0.0009765625;
38+
protected override double KibibytesPerSecondInOneBitPerSecond => 0.0001220703125;
3939

40-
protected override decimal MegabitsPerSecondInOneBitPerSecond => 1E-6m;
41-
protected override decimal MegabytesPerSecondInOneBitPerSecond => 1.25E-07m;
42-
protected override decimal MebibitsPerSecondInOneBitPerSecond => 9.5367431640625E-07m;
43-
protected override decimal MebibytesPerSecondInOneBitPerSecond => 1.19209289550781E-07m;
40+
protected override double MegabitsPerSecondInOneBitPerSecond => 1E-6;
41+
protected override double MegabytesPerSecondInOneBitPerSecond => 1.25E-07;
42+
protected override double MebibitsPerSecondInOneBitPerSecond => 9.5367431640625E-07;
43+
protected override double MebibytesPerSecondInOneBitPerSecond => 1.19209289550781E-07;
4444

45-
protected override decimal GigabitsPerSecondInOneBitPerSecond => 1E-9m;
46-
protected override decimal GigabytesPerSecondInOneBitPerSecond => 1.25E-10m;
47-
protected override decimal GibibitsPerSecondInOneBitPerSecond => 9.31322574615479E-10m;
48-
protected override decimal GibibytesPerSecondInOneBitPerSecond => 1.16415321826935E-10m;
45+
protected override double GigabitsPerSecondInOneBitPerSecond => 1E-9;
46+
protected override double GigabytesPerSecondInOneBitPerSecond => 1.25E-10;
47+
protected override double GibibitsPerSecondInOneBitPerSecond => 9.31322574615479E-10;
48+
protected override double GibibytesPerSecondInOneBitPerSecond => 1.16415321826935E-10;
4949

50-
protected override decimal TerabitsPerSecondInOneBitPerSecond => 1E-12m;
51-
protected override decimal TerabytesPerSecondInOneBitPerSecond => 1.25E-13m;
52-
protected override decimal TebibitsPerSecondInOneBitPerSecond => 9.09494701772928E-13m;
53-
protected override decimal TebibytesPerSecondInOneBitPerSecond => 1.13686837721616E-13m;
50+
protected override double TerabitsPerSecondInOneBitPerSecond => 1E-12;
51+
protected override double TerabytesPerSecondInOneBitPerSecond => 1.25E-13;
52+
protected override double TebibitsPerSecondInOneBitPerSecond => 9.09494701772928E-13;
53+
protected override double TebibytesPerSecondInOneBitPerSecond => 1.13686837721616E-13;
5454

55-
protected override decimal PetabitsPerSecondInOneBitPerSecond => 1E-15m;
56-
protected override decimal PetabytesPerSecondInOneBitPerSecond => 1.25E-16m;
57-
protected override decimal PebibitsPerSecondInOneBitPerSecond => 8.88178419700125E-16m;
58-
protected override decimal PebibytesPerSecondInOneBitPerSecond => 1.11022302462516E-16m;
55+
protected override double PetabitsPerSecondInOneBitPerSecond => 1E-15;
56+
protected override double PetabytesPerSecondInOneBitPerSecond => 1.25E-16;
57+
protected override double PebibitsPerSecondInOneBitPerSecond => 8.88178419700125E-16;
58+
protected override double PebibytesPerSecondInOneBitPerSecond => 1.11022302462516E-16;
5959

60-
protected override decimal ExabitsPerSecondInOneBitPerSecond => 1E-18m;
61-
protected override decimal ExabytesPerSecondInOneBitPerSecond => 1.25E-19m;
62-
protected override decimal ExbibitsPerSecondInOneBitPerSecond => 8.67361738E-19m;
63-
protected override decimal ExbibytesPerSecondInOneBitPerSecond => 1.0842021724855E-19m;
60+
protected override double ExabitsPerSecondInOneBitPerSecond => 1E-18;
61+
protected override double ExabytesPerSecondInOneBitPerSecond => 1.25E-19;
62+
protected override double ExbibitsPerSecondInOneBitPerSecond => 8.67361738E-19;
63+
protected override double ExbibytesPerSecondInOneBitPerSecond => 1.0842021724855E-19;
6464
}
6565
}

‎UnitsNet.Tests/CustomCode/InformationTests.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,57 +9,57 @@ namespace UnitsNet.Tests
99
public class InformationTests : InformationTestsBase
1010
{
1111
protected override bool SupportsSIUnitSystem => false;
12-
protected override decimal BitsInOneBit => 1m;
12+
protected override double BitsInOneBit => 1;
1313

14-
protected override decimal BytesInOneBit => 0.125m;
14+
protected override double BytesInOneBit => 0.125;
1515

16-
protected override decimal ExabitsInOneBit => 1e-18m;
16+
protected override double ExabitsInOneBit => 1e-18;
1717

18-
protected override decimal ExabytesInOneBit => 0.125m*1e-18m;
18+
protected override double ExabytesInOneBit => 0.125*1e-18;
1919

20-
protected override decimal ExbibitsInOneBit => 1m/(decimal)Math.Pow(1024, 6);
20+
protected override double ExbibitsInOneBit => 1d/Math.Pow(1024, 6);
2121

22-
protected override decimal ExbibytesInOneBit => 1m/8m/(decimal)Math.Pow(1024, 6);
22+
protected override double ExbibytesInOneBit => 1d/8/Math.Pow(1024, 6);
2323

24-
protected override decimal GibibitsInOneBit => 1m/(decimal)Math.Pow(1024, 3);
24+
protected override double GibibitsInOneBit => 1d/Math.Pow(1024, 3);
2525

26-
protected override decimal GibibytesInOneBit => 1m/8m/(decimal)Math.Pow(1024, 3);
26+
protected override double GibibytesInOneBit => 1d/8/Math.Pow(1024, 3);
2727

28-
protected override decimal GigabitsInOneBit => 1e-9m;
28+
protected override double GigabitsInOneBit => 1e-9;
2929

30-
protected override decimal GigabytesInOneBit => 0.125m*1e-9m;
30+
protected override double GigabytesInOneBit => 0.125*1e-9;
3131

32-
protected override decimal KibibitsInOneBit => 1m/1024m;
32+
protected override double KibibitsInOneBit => 1d/1024;
3333

34-
protected override decimal KibibytesInOneBit => 1m/8/1024m;
34+
protected override double KibibytesInOneBit => 1d/8/1024;
3535

36-
protected override decimal KilobitsInOneBit => 0.001m;
36+
protected override double KilobitsInOneBit => 0.001;
3737

38-
protected override decimal KilobytesInOneBit => 0.000125m;
38+
protected override double KilobytesInOneBit => 0.000125;
3939

40-
protected override decimal MebibitsInOneBit => 1m/(decimal)Math.Pow(1024, 2);
40+
protected override double MebibitsInOneBit => 1d/Math.Pow(1024, 2);
4141

42-
protected override decimal MebibytesInOneBit => 1m/8m/(decimal)Math.Pow(1024, 2);
42+
protected override double MebibytesInOneBit => 1d/8/Math.Pow(1024, 2);
4343

44-
protected override decimal MegabitsInOneBit => 1e-6m;
44+
protected override double MegabitsInOneBit => 1e-6;
4545

46-
protected override decimal MegabytesInOneBit => 0.125m*1e-6m;
46+
protected override double MegabytesInOneBit => 0.125*1e-6;
4747

48-
protected override decimal PebibitsInOneBit => 1m/(decimal)Math.Pow(1024, 5);
48+
protected override double PebibitsInOneBit => 1d/Math.Pow(1024, 5);
4949

50-
protected override decimal PebibytesInOneBit => 1m/8m/(decimal)Math.Pow(1024, 5);
50+
protected override double PebibytesInOneBit => 1d/8/Math.Pow(1024, 5);
5151

52-
protected override decimal PetabitsInOneBit => 1e-15m;
52+
protected override double PetabitsInOneBit => 1e-15;
5353

54-
protected override decimal PetabytesInOneBit => 0.125m*1e-15m;
54+
protected override double PetabytesInOneBit => 0.125*1e-15;
5555

56-
protected override decimal TebibitsInOneBit => 1m/(decimal)Math.Pow(1024, 4);
56+
protected override double TebibitsInOneBit => 1d/Math.Pow(1024, 4);
5757

58-
protected override decimal TebibytesInOneBit => 1m/8m/(decimal)Math.Pow(1024, 4);
58+
protected override double TebibytesInOneBit => 1d/8/Math.Pow(1024, 4);
5959

60-
protected override decimal TerabitsInOneBit => 1e-12m;
60+
protected override double TerabitsInOneBit => 1e-12;
6161

62-
protected override decimal TerabytesInOneBit => 0.125m*1e-12m;
62+
protected override double TerabytesInOneBit => 0.125*1e-12;
6363

6464
[Fact]
6565
public void OneKBHas1000Bytes()

‎UnitsNet.Tests/CustomCode/ParseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public void ParseForceWithPrefixUnits_GivenCulture_ReturnsQuantityWithSameUnitAn
202202
[InlineData("1 MB", "ru-RU", 1, InformationUnit.Megabyte)]
203203
[InlineData("1 MiB", "en-US", 1, InformationUnit.Mebibyte)]
204204
[InlineData("1 MiB", "ru-RU", 1, InformationUnit.Mebibyte)]
205-
public void ParseInformationWithPrefixUnits_GivenCulture_ReturnsQuantityWithSameUnitAndValue(string str, string cultureName, decimal expectedValue, Enum expectedUnit)
205+
public void ParseInformationWithPrefixUnits_GivenCulture_ReturnsQuantityWithSameUnitAndValue(string str, string cultureName, double expectedValue, Enum expectedUnit)
206206
{
207207
var actual = Information.Parse(str, CultureInfo.GetCultureInfo(cultureName));
208208

‎UnitsNet.Tests/Serialization/Json/DefaultDataContractJsonSerializerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ public void InterfaceObject_IncludesTypeInformation()
102102
{
103103
var unit = InformationUnit.Exabyte;
104104
var unitInt = (int)unit;
105-
var testObject = new TestInterfaceObject { Quantity = new Information(1.20m, unit) };
106-
var expectedJson = $"{{\"Quantity\":{{\"__type\":\"Information:#UnitsNet\",\"Value\":1.20,\"Unit\":{unitInt}}}}}";
105+
var testObject = new TestInterfaceObject { Quantity = new Information(1.2, unit) };
106+
var expectedJson = $"{{\"Quantity\":{{\"__type\":\"Information:#UnitsNet\",\"Value\":1.2,\"Unit\":{unitInt}}}}}";
107107

108108
var json = SerializeObject(testObject);
109109

‎UnitsNet.Tests/Serialization/Xml/DataContractSerializerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public void DoubleQuantity_SerializedWithValueAndMemberName()
5050
[Fact]
5151
public void InterfaceObject_IncludesTypeInformation()
5252
{
53-
var testObject = new TestInterfaceObject { Quantity = new Information(1.20m, InformationUnit.Exabyte) };
53+
var testObject = new TestInterfaceObject { Quantity = new Information(1.2, InformationUnit.Exabyte) };
5454

5555
var quantityNamespace = "xmlns:a=\"http://schemas.datacontract.org/2004/07/UnitsNet\""; // there is an extra 'a' compared to Namespace
56-
var expectedQuantityXml = $"<Quantity i:type=\"a:Information\" {quantityNamespace}><a:Value>1.20</a:Value><a:Unit>Exabyte</a:Unit></Quantity>";
56+
var expectedQuantityXml = $"<Quantity i:type=\"a:Information\" {quantityNamespace}><a:Value>1.2</a:Value><a:Unit>Exabyte</a:Unit></Quantity>";
5757
var expectedXml = $"<TestInterfaceObject xmlns=\"http://schemas.datacontract.org/2004/07/UnitsNet.Tests.Serialization\" {XmlSchema}>{expectedQuantityXml}</TestInterfaceObject>";
5858

5959
var xml = SerializeObject(testObject);

0 commit comments

Comments
 (0)