Skip to content

Commit 344dfa5

Browse files
author
Erik Ovegard
committed
Added ToStringDefaultUnit to enable custom units for ToString().
1 parent 0d943b7 commit 344dfa5

File tree

70 files changed

+4642
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+4642
-35
lines changed

‎UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,5 +199,99 @@ public void EqualsReturnsFalseOnNull()
199199
Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1);
200200
Assert.IsFalse(meterpersecondsquared.Equals(null));
201201
}
202+
203+
[Test]
204+
public void ToStringReturnsCorrectNumberAndUnitWithDefaultUnit()
205+
{
206+
Acceleration.ToStringDefaultUnit = AccelerationUnit.MeterPerSecondSquared;
207+
Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1);
208+
string meterpersecondsquaredString = meterpersecondsquared.ToString();
209+
Assert.AreEqual("1 " + UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.MeterPerSecondSquared), meterpersecondsquaredString);
210+
}
211+
212+
[Test]
213+
public void ToStringReturnsCorrectNumberAndUnitWithCentimeterPerSecondSquaredAsDefualtUnit()
214+
{
215+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
216+
Acceleration.ToStringDefaultUnit = AccelerationUnit.CentimeterPerSecondSquared;
217+
Acceleration value = Acceleration.From(1, AccelerationUnit.CentimeterPerSecondSquared);
218+
string valueString = value.ToString();
219+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.CentimeterPerSecondSquared);
220+
Acceleration.ToStringDefaultUnit = oldUnit;
221+
Assert.AreEqual("1 " + unitString, valueString);
222+
}
223+
224+
[Test]
225+
public void ToStringReturnsCorrectNumberAndUnitWithDecimeterPerSecondSquaredAsDefualtUnit()
226+
{
227+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
228+
Acceleration.ToStringDefaultUnit = AccelerationUnit.DecimeterPerSecondSquared;
229+
Acceleration value = Acceleration.From(1, AccelerationUnit.DecimeterPerSecondSquared);
230+
string valueString = value.ToString();
231+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.DecimeterPerSecondSquared);
232+
Acceleration.ToStringDefaultUnit = oldUnit;
233+
Assert.AreEqual("1 " + unitString, valueString);
234+
}
235+
236+
[Test]
237+
public void ToStringReturnsCorrectNumberAndUnitWithKilometerPerSecondSquaredAsDefualtUnit()
238+
{
239+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
240+
Acceleration.ToStringDefaultUnit = AccelerationUnit.KilometerPerSecondSquared;
241+
Acceleration value = Acceleration.From(1, AccelerationUnit.KilometerPerSecondSquared);
242+
string valueString = value.ToString();
243+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.KilometerPerSecondSquared);
244+
Acceleration.ToStringDefaultUnit = oldUnit;
245+
Assert.AreEqual("1 " + unitString, valueString);
246+
}
247+
248+
[Test]
249+
public void ToStringReturnsCorrectNumberAndUnitWithMeterPerSecondSquaredAsDefualtUnit()
250+
{
251+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
252+
Acceleration.ToStringDefaultUnit = AccelerationUnit.MeterPerSecondSquared;
253+
Acceleration value = Acceleration.From(1, AccelerationUnit.MeterPerSecondSquared);
254+
string valueString = value.ToString();
255+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.MeterPerSecondSquared);
256+
Acceleration.ToStringDefaultUnit = oldUnit;
257+
Assert.AreEqual("1 " + unitString, valueString);
258+
}
259+
260+
[Test]
261+
public void ToStringReturnsCorrectNumberAndUnitWithMicrometerPerSecondSquaredAsDefualtUnit()
262+
{
263+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
264+
Acceleration.ToStringDefaultUnit = AccelerationUnit.MicrometerPerSecondSquared;
265+
Acceleration value = Acceleration.From(1, AccelerationUnit.MicrometerPerSecondSquared);
266+
string valueString = value.ToString();
267+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.MicrometerPerSecondSquared);
268+
Acceleration.ToStringDefaultUnit = oldUnit;
269+
Assert.AreEqual("1 " + unitString, valueString);
270+
}
271+
272+
[Test]
273+
public void ToStringReturnsCorrectNumberAndUnitWithMillimeterPerSecondSquaredAsDefualtUnit()
274+
{
275+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
276+
Acceleration.ToStringDefaultUnit = AccelerationUnit.MillimeterPerSecondSquared;
277+
Acceleration value = Acceleration.From(1, AccelerationUnit.MillimeterPerSecondSquared);
278+
string valueString = value.ToString();
279+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.MillimeterPerSecondSquared);
280+
Acceleration.ToStringDefaultUnit = oldUnit;
281+
Assert.AreEqual("1 " + unitString, valueString);
282+
}
283+
284+
[Test]
285+
public void ToStringReturnsCorrectNumberAndUnitWithNanometerPerSecondSquaredAsDefualtUnit()
286+
{
287+
AccelerationUnit oldUnit = Acceleration.ToStringDefaultUnit;
288+
Acceleration.ToStringDefaultUnit = AccelerationUnit.NanometerPerSecondSquared;
289+
Acceleration value = Acceleration.From(1, AccelerationUnit.NanometerPerSecondSquared);
290+
string valueString = value.ToString();
291+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AccelerationUnit.NanometerPerSecondSquared);
292+
Acceleration.ToStringDefaultUnit = oldUnit;
293+
Assert.AreEqual("1 " + unitString, valueString);
294+
}
295+
202296
}
203297
}

‎UnitsNet.Tests/GeneratedCode/AmplitudeRatioTestsBase.g.cs‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,5 +179,51 @@ public void EqualsReturnsFalseOnNull()
179179
AmplitudeRatio decibelvolt = AmplitudeRatio.FromDecibelVolts(1);
180180
Assert.IsFalse(decibelvolt.Equals(null));
181181
}
182+
183+
[Test]
184+
public void ToStringReturnsCorrectNumberAndUnitWithDefaultUnit()
185+
{
186+
AmplitudeRatio.ToStringDefaultUnit = AmplitudeRatioUnit.DecibelVolt;
187+
AmplitudeRatio decibelvolt = AmplitudeRatio.FromDecibelVolts(1);
188+
string decibelvoltString = decibelvolt.ToString();
189+
Assert.AreEqual("1 " + UnitSystem.GetCached(null).GetDefaultAbbreviation(AmplitudeRatioUnit.DecibelVolt), decibelvoltString);
190+
}
191+
192+
[Test]
193+
public void ToStringReturnsCorrectNumberAndUnitWithDecibelMicrovoltAsDefualtUnit()
194+
{
195+
AmplitudeRatioUnit oldUnit = AmplitudeRatio.ToStringDefaultUnit;
196+
AmplitudeRatio.ToStringDefaultUnit = AmplitudeRatioUnit.DecibelMicrovolt;
197+
AmplitudeRatio value = AmplitudeRatio.From(1, AmplitudeRatioUnit.DecibelMicrovolt);
198+
string valueString = value.ToString();
199+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AmplitudeRatioUnit.DecibelMicrovolt);
200+
AmplitudeRatio.ToStringDefaultUnit = oldUnit;
201+
Assert.AreEqual("1 " + unitString, valueString);
202+
}
203+
204+
[Test]
205+
public void ToStringReturnsCorrectNumberAndUnitWithDecibelMillivoltAsDefualtUnit()
206+
{
207+
AmplitudeRatioUnit oldUnit = AmplitudeRatio.ToStringDefaultUnit;
208+
AmplitudeRatio.ToStringDefaultUnit = AmplitudeRatioUnit.DecibelMillivolt;
209+
AmplitudeRatio value = AmplitudeRatio.From(1, AmplitudeRatioUnit.DecibelMillivolt);
210+
string valueString = value.ToString();
211+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AmplitudeRatioUnit.DecibelMillivolt);
212+
AmplitudeRatio.ToStringDefaultUnit = oldUnit;
213+
Assert.AreEqual("1 " + unitString, valueString);
214+
}
215+
216+
[Test]
217+
public void ToStringReturnsCorrectNumberAndUnitWithDecibelVoltAsDefualtUnit()
218+
{
219+
AmplitudeRatioUnit oldUnit = AmplitudeRatio.ToStringDefaultUnit;
220+
AmplitudeRatio.ToStringDefaultUnit = AmplitudeRatioUnit.DecibelVolt;
221+
AmplitudeRatio value = AmplitudeRatio.From(1, AmplitudeRatioUnit.DecibelVolt);
222+
string valueString = value.ToString();
223+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AmplitudeRatioUnit.DecibelVolt);
224+
AmplitudeRatio.ToStringDefaultUnit = oldUnit;
225+
Assert.AreEqual("1 " + unitString, valueString);
226+
}
227+
182228
}
183229
}

‎UnitsNet.Tests/GeneratedCode/AngleTestsBase.g.cs‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,5 +217,135 @@ public void EqualsReturnsFalseOnNull()
217217
Angle degree = Angle.FromDegrees(1);
218218
Assert.IsFalse(degree.Equals(null));
219219
}
220+
221+
[Test]
222+
public void ToStringReturnsCorrectNumberAndUnitWithDefaultUnit()
223+
{
224+
Angle.ToStringDefaultUnit = AngleUnit.Degree;
225+
Angle degree = Angle.FromDegrees(1);
226+
string degreeString = degree.ToString();
227+
Assert.AreEqual("1 " + UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Degree), degreeString);
228+
}
229+
230+
[Test]
231+
public void ToStringReturnsCorrectNumberAndUnitWithArcminuteAsDefualtUnit()
232+
{
233+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
234+
Angle.ToStringDefaultUnit = AngleUnit.Arcminute;
235+
Angle value = Angle.From(1, AngleUnit.Arcminute);
236+
string valueString = value.ToString();
237+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Arcminute);
238+
Angle.ToStringDefaultUnit = oldUnit;
239+
Assert.AreEqual("1 " + unitString, valueString);
240+
}
241+
242+
[Test]
243+
public void ToStringReturnsCorrectNumberAndUnitWithArcsecondAsDefualtUnit()
244+
{
245+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
246+
Angle.ToStringDefaultUnit = AngleUnit.Arcsecond;
247+
Angle value = Angle.From(1, AngleUnit.Arcsecond);
248+
string valueString = value.ToString();
249+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Arcsecond);
250+
Angle.ToStringDefaultUnit = oldUnit;
251+
Assert.AreEqual("1 " + unitString, valueString);
252+
}
253+
254+
[Test]
255+
public void ToStringReturnsCorrectNumberAndUnitWithCentiradianAsDefualtUnit()
256+
{
257+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
258+
Angle.ToStringDefaultUnit = AngleUnit.Centiradian;
259+
Angle value = Angle.From(1, AngleUnit.Centiradian);
260+
string valueString = value.ToString();
261+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Centiradian);
262+
Angle.ToStringDefaultUnit = oldUnit;
263+
Assert.AreEqual("1 " + unitString, valueString);
264+
}
265+
266+
[Test]
267+
public void ToStringReturnsCorrectNumberAndUnitWithDeciradianAsDefualtUnit()
268+
{
269+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
270+
Angle.ToStringDefaultUnit = AngleUnit.Deciradian;
271+
Angle value = Angle.From(1, AngleUnit.Deciradian);
272+
string valueString = value.ToString();
273+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Deciradian);
274+
Angle.ToStringDefaultUnit = oldUnit;
275+
Assert.AreEqual("1 " + unitString, valueString);
276+
}
277+
278+
[Test]
279+
public void ToStringReturnsCorrectNumberAndUnitWithDegreeAsDefualtUnit()
280+
{
281+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
282+
Angle.ToStringDefaultUnit = AngleUnit.Degree;
283+
Angle value = Angle.From(1, AngleUnit.Degree);
284+
string valueString = value.ToString();
285+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Degree);
286+
Angle.ToStringDefaultUnit = oldUnit;
287+
Assert.AreEqual("1 " + unitString, valueString);
288+
}
289+
290+
[Test]
291+
public void ToStringReturnsCorrectNumberAndUnitWithGradianAsDefualtUnit()
292+
{
293+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
294+
Angle.ToStringDefaultUnit = AngleUnit.Gradian;
295+
Angle value = Angle.From(1, AngleUnit.Gradian);
296+
string valueString = value.ToString();
297+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Gradian);
298+
Angle.ToStringDefaultUnit = oldUnit;
299+
Assert.AreEqual("1 " + unitString, valueString);
300+
}
301+
302+
[Test]
303+
public void ToStringReturnsCorrectNumberAndUnitWithMicroradianAsDefualtUnit()
304+
{
305+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
306+
Angle.ToStringDefaultUnit = AngleUnit.Microradian;
307+
Angle value = Angle.From(1, AngleUnit.Microradian);
308+
string valueString = value.ToString();
309+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Microradian);
310+
Angle.ToStringDefaultUnit = oldUnit;
311+
Assert.AreEqual("1 " + unitString, valueString);
312+
}
313+
314+
[Test]
315+
public void ToStringReturnsCorrectNumberAndUnitWithMilliradianAsDefualtUnit()
316+
{
317+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
318+
Angle.ToStringDefaultUnit = AngleUnit.Milliradian;
319+
Angle value = Angle.From(1, AngleUnit.Milliradian);
320+
string valueString = value.ToString();
321+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Milliradian);
322+
Angle.ToStringDefaultUnit = oldUnit;
323+
Assert.AreEqual("1 " + unitString, valueString);
324+
}
325+
326+
[Test]
327+
public void ToStringReturnsCorrectNumberAndUnitWithNanoradianAsDefualtUnit()
328+
{
329+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
330+
Angle.ToStringDefaultUnit = AngleUnit.Nanoradian;
331+
Angle value = Angle.From(1, AngleUnit.Nanoradian);
332+
string valueString = value.ToString();
333+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Nanoradian);
334+
Angle.ToStringDefaultUnit = oldUnit;
335+
Assert.AreEqual("1 " + unitString, valueString);
336+
}
337+
338+
[Test]
339+
public void ToStringReturnsCorrectNumberAndUnitWithRadianAsDefualtUnit()
340+
{
341+
AngleUnit oldUnit = Angle.ToStringDefaultUnit;
342+
Angle.ToStringDefaultUnit = AngleUnit.Radian;
343+
Angle value = Angle.From(1, AngleUnit.Radian);
344+
string valueString = value.ToString();
345+
string unitString = UnitSystem.GetCached(null).GetDefaultAbbreviation(AngleUnit.Radian);
346+
Angle.ToStringDefaultUnit = oldUnit;
347+
Assert.AreEqual("1 " + unitString, valueString);
348+
}
349+
220350
}
221351
}

0 commit comments

Comments
 (0)