♻️ tests: Fix namespaces

angularsen · angularsen · commit 4b8eb32a83a9 · 2022-12-26T23:14:28.000+01:00
diff --git a/UnitsNet.Benchmark/UnitsNet.Benchmark.csproj b/UnitsNet.Benchmark/UnitsNet.Benchmark.csproj
@@ -6,7 +6,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyTitle>UnitsNet.Benchmark</AssemblyTitle>
     <Product>UnitsNet.Benchmark</Product>
-    <RootNamespace>UnitsNet</RootNamespace>
+    <RootNamespace>UnitsNet.Benchmark</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UnitsNet.Serialization.JsonNet.Tests/CustomQuantities/HowMuchTests.cs b/UnitsNet.Serialization.JsonNet.Tests/CustomQuantities/HowMuchTests.cs
@@ -1,8 +1,8 @@
 ﻿using Newtonsoft.Json;
-using UnitsNet.Serialization.JsonNet;
+using UnitsNet.Tests.CustomQuantities;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomQuantities
+namespace UnitsNet.Serialization.JsonNet.Tests.CustomQuantities
 {
     public class HowMuchTests
     {
diff --git a/UnitsNet.Tests/CustomCode/AccelerationTests.cs b/UnitsNet.Tests/CustomCode/AccelerationTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class AccelerationTests : AccelerationTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/AmplitudeRatioTests.cs b/UnitsNet.Tests/CustomCode/AmplitudeRatioTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class AmplitudeRatioTests : AmplitudeRatioTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/AngleTests.cs b/UnitsNet.Tests/CustomCode/AngleTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class AngleTests : AngleTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/AreaTests.cs b/UnitsNet.Tests/CustomCode/AreaTests.cs
@@ -4,7 +4,7 @@
 using UnitsNet.Units;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class AreaTests : AreaTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/BrakeSpecificFuelConsumptionTests.cs b/UnitsNet.Tests/CustomCode/BrakeSpecificFuelConsumptionTests.cs
@@ -4,7 +4,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class BrakeSpecificFuelConsumptionTests : BrakeSpecificFuelConsumptionTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/DensityTests.cs b/UnitsNet.Tests/CustomCode/DensityTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class DensityTests : DensityTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/DurationTests.cs b/UnitsNet.Tests/CustomCode/DurationTests.cs
@@ -1,11 +1,11 @@
 ﻿// Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
-using Xunit;
 using System;
 using System.Globalization;
+using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class DurationTests : DurationTestsBase
     {
@@ -190,7 +190,7 @@ public void DurationTimesVolumeFlowEqualsVolume()
         [InlineData("1 сек", 1, "ru-RU")]
         [InlineData("1000 мс", 1, "ru-RU")]
         [InlineData("1000 мсек", 1, "ru-RU")]
-        public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(string textValue, double expectedSeconds, string culture = null)
+        public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(string textValue, double expectedSeconds, string? culture = null)
         {
             var cultureInfo = culture == null ? null : new CultureInfo(culture);
 
diff --git a/UnitsNet.Tests/CustomCode/DynamicViscosityTests.cs b/UnitsNet.Tests/CustomCode/DynamicViscosityTests.cs
@@ -4,7 +4,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class DynamicViscosityTests : DynamicViscosityTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ElectricChargeTests.cs b/UnitsNet.Tests/CustomCode/ElectricChargeTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class ElectricChargeTests : ElectricChargeTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ElectricCurrentTests.cs b/UnitsNet.Tests/CustomCode/ElectricCurrentTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class ElectricCurrentTests : ElectricCurrentTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ElectricPotentialTests.cs b/UnitsNet.Tests/CustomCode/ElectricPotentialTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class ElectricPotentialTests : ElectricPotentialTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ElectricResistanceTests.cs b/UnitsNet.Tests/CustomCode/ElectricResistanceTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class ElectricResistanceTests : ElectricResistanceTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/EnergyTests.cs b/UnitsNet.Tests/CustomCode/EnergyTests.cs
@@ -5,7 +5,7 @@
 using UnitsNet.Units;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class EnergyTests : EnergyTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ForceChangeRateTests.cs b/UnitsNet.Tests/CustomCode/ForceChangeRateTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class ForceChangeRateTests : ForceChangeRateTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ForceTests.cs b/UnitsNet.Tests/CustomCode/ForceTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class ForceTests : ForceTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/FrequencyTests.cs b/UnitsNet.Tests/CustomCode/FrequencyTests.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class FrequencyTests : FrequencyTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/IQuantityTests.cs b/UnitsNet.Tests/CustomCode/IQuantityTests.cs
@@ -2,11 +2,13 @@
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using UnitsNet.Units;
 using Xunit;
 
 namespace UnitsNet.Tests
 {
+    // ReSharper disable once InconsistentNaming
     public partial class IQuantityTests
     {
         [Fact]
@@ -17,10 +19,11 @@ public void As_GivenWrongUnitType_ThrowsArgumentException()
         }
 
         [Fact]
+        [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
         public void As_GivenNullUnitSystem_ThrowsArgumentNullException()
         {
             IQuantity imperialLengthQuantity = new Length(2.0, LengthUnit.Inch);
-            Assert.Throws<ArgumentNullException>(() => imperialLengthQuantity.As((UnitSystem)null));
+            Assert.Throws<ArgumentNullException>(() => imperialLengthQuantity.As((UnitSystem)null!));
         }
 
         [Fact]
@@ -41,7 +44,7 @@ public void ToUnit_GivenWrongUnitType_ThrowsArgumentException()
         public void ToUnit_GivenNullUnitSystem_ThrowsArgumentNullException()
         {
             IQuantity imperialLengthQuantity = new Length(2.0, LengthUnit.Inch);
-            Assert.Throws<ArgumentNullException>(() => imperialLengthQuantity.ToUnit((UnitSystem)null));
+            Assert.Throws<ArgumentNullException>(() => imperialLengthQuantity.ToUnit((UnitSystem)null!));
         }
 
         [Fact]
diff --git a/UnitsNet.Tests/CustomCode/InformationTests.cs b/UnitsNet.Tests/CustomCode/InformationTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class InformationTests : InformationTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/JerkTests.cs b/UnitsNet.Tests/CustomCode/JerkTests.cs
@@ -1,8 +1,9 @@
 ﻿// Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
+
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class JerkTests : JerkTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/KinematicViscosityTests.cs b/UnitsNet.Tests/CustomCode/KinematicViscosityTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class KinematicViscosityTests : KinematicViscosityTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/KnownQuantities.cs b/UnitsNet.Tests/CustomCode/KnownQuantities.cs
@@ -1,4 +1,4 @@
-﻿namespace UnitsNet.Tests.CustomCode
+﻿namespace UnitsNet.Tests
 {
     public static class KnownQuantities
     {
diff --git a/UnitsNet.Tests/CustomCode/LengthTests.FeetInches.cs b/UnitsNet.Tests/CustomCode/LengthTests.FeetInches.cs
@@ -5,7 +5,7 @@
 using System.Globalization;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class FeetInchesTests
     {
diff --git a/UnitsNet.Tests/CustomCode/LengthTests.cs b/UnitsNet.Tests/CustomCode/LengthTests.cs
@@ -1,11 +1,11 @@
 ﻿// Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
-using Xunit;
-using UnitsNet.Units;
 using System;
+using UnitsNet.Units;
+using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     // Avoid accessing static prop DefaultToString in parallel from multiple tests:
     // UnitSystemTests.DefaultToStringFormatting()
@@ -173,7 +173,7 @@ public void NegativeLengthToStonePoundsReturnsCorrectValues()
         [Fact]
         public void Constructor_UnitSystemNull_ThrowsArgumentNullException()
         {
-            Assert.Throws<ArgumentNullException>(() => new Length(1.0, (UnitSystem)null));
+            Assert.Throws<ArgumentNullException>(() => new Length(1.0, unitSystem: null!));
         }
 
         [Fact]
@@ -216,7 +216,7 @@ public void ToUnit_GivenSIUnitSystem_ReturnsSIQuantity()
         [InlineData(2.0, 0.5)]
         public static void InverseReturnsReciprocalLength(double value, double expected)
         {
-            var length = new Length(value, Units.LengthUnit.Meter);
+            var length = new Length(value, LengthUnit.Meter);
             var inverseLength = length.Inverse();
 
             Assert.Equal(expected, inverseLength.InverseMeters);
diff --git a/UnitsNet.Tests/CustomCode/LevelTests.cs b/UnitsNet.Tests/CustomCode/LevelTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class LevelTests : LevelTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/MassFlowTests.cs b/UnitsNet.Tests/CustomCode/MassFlowTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class MassFlowTests : MassFlowTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/MassTests.cs b/UnitsNet.Tests/CustomCode/MassTests.cs
@@ -5,7 +5,7 @@
 using UnitsNet.Units;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class MassTests : MassTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/ParseTests.cs b/UnitsNet.Tests/CustomCode/ParseTests.cs
@@ -6,7 +6,7 @@
 using UnitsNet.Units;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     /// <remarks>
     ///     These test methods would ideally be generated for each unit class,
diff --git a/UnitsNet.Tests/CustomCode/PowerRatioTests.cs b/UnitsNet.Tests/CustomCode/PowerRatioTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class PowerRatioTests : PowerRatioTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/PowerTests.cs b/UnitsNet.Tests/CustomCode/PowerTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class PowerTests : PowerTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/PressureChangeRateTests.cs b/UnitsNet.Tests/CustomCode/PressureChangeRateTests.cs
@@ -1,7 +1,7 @@
 ﻿// Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class PressureChangeRateTests : PressureChangeRateTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/PressureTests.cs b/UnitsNet.Tests/CustomCode/PressureTests.cs
@@ -6,7 +6,7 @@
 using UnitsNet.Wrappers;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class PressureTests : PressureTestsBase
     {
@@ -214,7 +214,7 @@ public void PressureTimesAreaEqualsForce()
         public void Reference_WithDefaultPressureReference_IsAbsolute()
         {
             var refPressure = new ReferencePressure(Pressure.FromAtmospheres(3));
-            Equals(PressureReference.Absolute, refPressure.Reference);
+            Assert.Equal(PressureReference.Absolute, refPressure.Reference);
         }
 
         [Fact]
diff --git a/UnitsNet.Tests/CustomCode/RatioTests.cs b/UnitsNet.Tests/CustomCode/RatioTests.cs
@@ -1,7 +1,7 @@
 ﻿// Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class RatioTests : RatioTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/RotationalSpeedTests.cs b/UnitsNet.Tests/CustomCode/RotationalSpeedTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class RotationalSpeedTests : RotationalSpeedTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/SpecificEnergyTests.cs b/UnitsNet.Tests/CustomCode/SpecificEnergyTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace UnitsNet.Tests.CustomCode
+namespace UnitsNet.Tests
 {
     public class SpecificEnergyTests : SpecificEnergyTestsBase
     {
diff --git a/UnitsNet.Tests/CustomCode/SpecificWeightTests.cs b/UnitsNet.Tests/CustomCode/SpecificWeightTests.cs
diff --git a/UnitsNet.Tests/CustomCode/SpeedTests.cs b/UnitsNet.Tests/CustomCode/SpeedTests.cs
diff --git a/UnitsNet.Tests/CustomCode/StonePoundsTests.cs b/UnitsNet.Tests/CustomCode/StonePoundsTests.cs
diff --git a/UnitsNet.Tests/CustomCode/TemperatureChangeRateTests.cs b/UnitsNet.Tests/CustomCode/TemperatureChangeRateTests.cs
diff --git a/UnitsNet.Tests/CustomCode/TemperatureTests.cs b/UnitsNet.Tests/CustomCode/TemperatureTests.cs
diff --git a/UnitsNet.Tests/CustomCode/TorqueTests.cs b/UnitsNet.Tests/CustomCode/TorqueTests.cs
diff --git a/UnitsNet.Tests/CustomCode/VitaminATests.cs b/UnitsNet.Tests/CustomCode/VitaminATests.cs
diff --git a/UnitsNet.Tests/CustomCode/VolumeTests.cs b/UnitsNet.Tests/CustomCode/VolumeTests.cs
diff --git a/UnitsNet.Tests/UnitsNet.Tests.csproj b/UnitsNet.Tests/UnitsNet.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`		`-using UnitsNet.Serialization.JsonNet;`
	`2`	`+using UnitsNet.Tests.CustomQuantities;`
`3`	`3`	`using Xunit;`
`4`	`4`
`5`		`-namespace UnitsNet.Tests.CustomQuantities`
	`5`	`+namespace UnitsNet.Serialization.JsonNet.Tests.CustomQuantities`
`6`	`6`	`{`
`7`	`7`	`public class HowMuchTests`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using Xunit;`
`5`	`5`
`6`		`-namespace UnitsNet.Tests.CustomCode`
	`6`	`+namespace UnitsNet.Tests`
`7`	`7`	`{`
`8`	`8`	`public class AccelerationTests : AccelerationTestsBase`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using Xunit;`
`6`	`6`
`7`		`-namespace UnitsNet.Tests.CustomCode`
	`7`	`+namespace UnitsNet.Tests`
`8`	`8`	`{`
`9`	`9`	`public class AmplitudeRatioTests : AmplitudeRatioTestsBase`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using UnitsNet.Units;`
`5`	`5`	`using Xunit;`
`6`	`6`
`7`		`-namespace UnitsNet.Tests.CustomCode`
	`7`	`+namespace UnitsNet.Tests`
`8`	`8`	`{`
`9`	`9`	`public class AreaTests : AreaTestsBase`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`// Licensed under MIT No Attribution, see LICENSE file at the root.`
`2`	`2`	`// Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.`
`3`	`3`
`4`		`-using Xunit;`
`5`	`4`	`using System;`
`6`	`5`	`using System.Globalization;`
	`6`	`+using Xunit;`
`7`	`7`
`8`		`-namespace UnitsNet.Tests.CustomCode`
	`8`	`+namespace UnitsNet.Tests`
`9`	`9`	`{`
`10`	`10`	`public class DurationTests : DurationTestsBase`
`11`	`11`	`{`
`@@ -190,7 +190,7 @@ public void DurationTimesVolumeFlowEqualsVolume()`
`190`	`190`	`[InlineData("1 сек", 1, "ru-RU")]`
`191`	`191`	`[InlineData("1000 мс", 1, "ru-RU")]`
`192`	`192`	`[InlineData("1000 мсек", 1, "ru-RU")]`
`193`		`- public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(string textValue, double expectedSeconds, string culture = null)`
	`193`	`+ public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(string textValue, double expectedSeconds, string? culture = null)`
`194`	`194`	`{`
`195`	`195`	`var cultureInfo = culture == null ? null : new CultureInfo(culture);`
`196`	`196`