Skip to content

Commit 6d40e50

Browse files
committed
Added remaining unit class tests using base class. Some tests are still failing.
1 parent 7d45d8b commit 6d40e50

File tree

8 files changed

+154
-755
lines changed

8 files changed

+154
-755
lines changed

Tests/AreaTests.cs

Lines changed: 19 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,56 @@
11
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
22
#pragma warning disable 1718
33

4-
using System;
54
using NUnit.Framework;
65

76
namespace UnitsNet.Tests.net35
87
{
98
[TestFixture]
10-
public class AreaTests
9+
public class AreaTests : AreaTestsBase
1110
{
12-
private const double Delta = 1E-5;
13-
private readonly Area _squareMeter = Area.FromSquareMeters(1);
14-
15-
[Test]
16-
public void SquareMetersToAreaUnits()
11+
protected override double SquareCentimetersInOneSquareMeter
1712
{
18-
Assert.AreEqual(1E-6, _squareMeter.SquareKilometers, Delta);
19-
Assert.AreEqual(1, _squareMeter.SquareMeters, Delta);
20-
Assert.AreEqual(1E2, _squareMeter.SquareDecimeters, Delta);
21-
Assert.AreEqual(1E4, _squareMeter.SquareCentimeters, Delta);
22-
Assert.AreEqual(1E6, _squareMeter.SquareMillimeters, Delta);
23-
24-
Assert.AreEqual(3.86102*1E-7, _squareMeter.SquareMiles, Delta);
25-
Assert.AreEqual(1.19599, _squareMeter.SquareYards, Delta);
26-
Assert.AreEqual(10.76391, _squareMeter.SquareFeet, Delta);
27-
Assert.AreEqual(1550.003100, _squareMeter.SquareInches, Delta);
13+
get { return 1E4; }
2814
}
2915

30-
[Test]
31-
public void AreaUnitsRoundTrip()
16+
protected override double SquareDecimetersInOneSquareMeter
3217
{
33-
Assert.AreEqual(1, Area.FromSquareKilometers(_squareMeter.SquareKilometers).SquareMeters, Delta);
34-
Assert.AreEqual(1, Area.FromSquareMeters(_squareMeter.SquareMeters).SquareMeters, Delta);
35-
Assert.AreEqual(1, Area.FromSquareDecimeters(_squareMeter.SquareDecimeters).SquareMeters, Delta);
36-
Assert.AreEqual(1, Area.FromSquareCentimeters(_squareMeter.SquareCentimeters).SquareMeters, Delta);
37-
Assert.AreEqual(1, Area.FromSquareMillimeters(_squareMeter.SquareMillimeters).SquareMeters, Delta);
38-
39-
Assert.AreEqual(1, Area.FromSquareMiles(_squareMeter.SquareMiles).SquareMeters, Delta);
40-
Assert.AreEqual(1, Area.FromSquareYards(_squareMeter.SquareYards).SquareMeters, Delta);
41-
Assert.AreEqual(1, Area.FromSquareFeet(_squareMeter.SquareFeet).SquareMeters, Delta);
42-
Assert.AreEqual(1, Area.FromSquareInches(_squareMeter.SquareInches).SquareMeters, Delta);
18+
get { return 1E2; }
4319
}
4420

45-
[Test]
46-
public void ArithmeticOperatorsRoundtrip()
21+
protected override double SquareFeetInOneSquareMeter
4722
{
48-
Area v = Area.FromSquareCentimeters(1);
49-
Assert.AreEqual(-1, -v.SquareCentimeters, Delta);
50-
Assert.AreEqual(2, (Area.FromSquareCentimeters(3)-v).SquareCentimeters, Delta);
51-
Assert.AreEqual(2, (v + v).SquareCentimeters, Delta);
52-
Assert.AreEqual(10, (v*10).SquareCentimeters, Delta);
53-
Assert.AreEqual(10, (10*v).SquareCentimeters, Delta);
54-
Assert.AreEqual(2, (Area.FromSquareCentimeters(10)/5).SquareCentimeters, Delta);
55-
Assert.AreEqual(2, Area.FromSquareCentimeters(10)/Area.FromSquareCentimeters(5), Delta);
23+
get { return 10.76391; }
5624
}
5725

58-
[Test]
59-
public void ComparisonOperators()
26+
protected override double SquareInchesInOneSquareMeter
6027
{
61-
Area oneSquareMeter = Area.FromSquareMeters(1);
62-
Area twoSquareMeters = Area.FromSquareMeters(2);
63-
64-
Assert.True(oneSquareMeter < twoSquareMeters);
65-
Assert.True(oneSquareMeter <= twoSquareMeters);
66-
Assert.True(twoSquareMeters > oneSquareMeter);
67-
Assert.True(twoSquareMeters >= oneSquareMeter);
68-
69-
Assert.False(oneSquareMeter > twoSquareMeters);
70-
Assert.False(oneSquareMeter >= twoSquareMeters);
71-
Assert.False(twoSquareMeters < oneSquareMeter);
72-
Assert.False(twoSquareMeters <= oneSquareMeter);
28+
get { return 1550.003100; }
7329
}
7430

75-
[Test]
76-
public void CompareToIsImplemented()
31+
protected override double SquareKilometersInOneSquareMeter
7732
{
78-
Area meter = Area.FromSquareMeters(1);
79-
Assert.AreEqual(0, meter.CompareTo(meter));
80-
Assert.Greater(meter.CompareTo(Area.Zero), 0);
81-
Assert.Less(Area.Zero.CompareTo(meter), 0);
33+
get { return 1E-6; }
8234
}
8335

84-
[Test]
85-
[ExpectedException(typeof(ArgumentException))]
86-
public void CompareToThrowsOnTypeMismatch()
36+
protected override double SquareMetersInOneSquareMeter
8737
{
88-
Area meter = Area.FromSquareMeters(1);
89-
// ReSharper disable once ReturnValueOfPureMethodIsNotUsed
90-
meter.CompareTo(new object());
91-
}
92-
93-
[Test]
94-
[ExpectedException(typeof(ArgumentNullException))]
95-
public void CompareToThrowsOnNull()
96-
{
97-
Area meter = Area.FromSquareMeters(1);
98-
// ReSharper disable once ReturnValueOfPureMethodIsNotUsed
99-
meter.CompareTo(null);
100-
}
101-
102-
103-
[Test]
104-
public void EqualityOperators()
105-
{
106-
Area a = Area.FromSquareMeters(1);
107-
Area b = Area.FromSquareMeters(2);
108-
109-
// ReSharper disable EqualExpressionComparison
110-
Assert.True(a == a);
111-
Assert.True(a != b);
112-
113-
Assert.False(a == b);
114-
Assert.False(a != a);
115-
// ReSharper restore EqualExpressionComparison
38+
get { return 1; }
11639
}
11740

118-
[Test]
119-
public void EqualsIsImplemented()
41+
protected override double SquareMilesInOneSquareMeter
12042
{
121-
Area v = Area.FromSquareMeters(1);
122-
Assert.IsTrue(v.Equals(Area.FromSquareMeters(1)));
123-
Assert.IsFalse(v.Equals(Area.Zero));
43+
get { return 3.86102*1E-7; }
12444
}
12545

126-
[Test]
127-
public void EqualsReturnsFalseOnTypeMismatch()
46+
protected override double SquareMillimetersInOneSquareMeter
12847
{
129-
Area meter = Area.FromSquareMeters(1);
130-
Assert.IsFalse(meter.Equals(new object()));
48+
get { return 1E6; }
13149
}
13250

133-
[Test]
134-
public void EqualsReturnsFalseOnNull()
51+
protected override double SquareYardsInOneSquareMeter
13552
{
136-
Area meter = Area.FromSquareMeters(1);
137-
Assert.IsFalse(meter.Equals(null));
53+
get { return 1.19599; }
13854
}
13955
}
14056
}

Tests/FlowTests.cs

Lines changed: 5 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,21 @@
11
// Disable build warning CS1718: Comparison made to same variable; did you mean to compare something else?
22
#pragma warning disable 1718
33

4-
using System;
54
using NUnit.Framework;
65

76
namespace UnitsNet.Tests.net35
87
{
98
[TestFixture]
10-
public class FlowTests
9+
public class FlowTests : FlowTestsBase
1110
{
12-
private const double Delta = 1E-5;
13-
14-
[Test]
15-
public void CubicMetersPerSecondToFlowUnits()
16-
{
17-
Flow cms = Flow.FromCubicMetersPerSecond(1);
18-
19-
Assert.AreEqual(1/3600.0, cms.CubicMetersPerHour, Delta);
20-
Assert.AreEqual(1, cms.CubicMetersPerSecond);
21-
}
22-
23-
[Test]
24-
public void FlowUnitsRoundTrip()
25-
{
26-
Flow cms = Flow.FromCubicMetersPerSecond(1);
27-
28-
Assert.AreEqual(1, Flow.FromCubicMetersPerSecond(cms.CubicMetersPerSecond).CubicMetersPerSecond, Delta);
29-
Assert.AreEqual(1, Flow.FromCubicMetersPerHour(cms.CubicMetersPerHour).CubicMetersPerSecond, Delta);
30-
}
31-
32-
[Test]
33-
public void ArithmeticOperators()
34-
{
35-
Flow v = Flow.FromCubicMetersPerSecond(1);
36-
Assert.AreEqual(-1, -v.CubicMetersPerSecond, Delta);
37-
Assert.AreEqual(2, (Flow.FromCubicMetersPerSecond(3) - v).CubicMetersPerSecond, Delta);
38-
Assert.AreEqual(2, (v + v).CubicMetersPerSecond, Delta);
39-
Assert.AreEqual(10, (v * 10).CubicMetersPerSecond, Delta);
40-
Assert.AreEqual(10, (10 * v).CubicMetersPerSecond, Delta);
41-
Assert.AreEqual(2, (Flow.FromCubicMetersPerSecond(10) / 5).CubicMetersPerSecond, Delta);
42-
Assert.AreEqual(2, Flow.FromCubicMetersPerSecond(10) / Flow.FromCubicMetersPerSecond(5), Delta);
43-
}
44-
45-
[Test]
46-
public void ComparisonOperators()
47-
{
48-
Flow oneMeter = Flow.FromCubicMetersPerSecond(1);
49-
Flow twoMeters = Flow.FromCubicMetersPerSecond(2);
50-
51-
Assert.True(oneMeter < twoMeters);
52-
Assert.True(oneMeter <= twoMeters);
53-
Assert.True(twoMeters > oneMeter);
54-
Assert.True(twoMeters >= oneMeter);
55-
56-
Assert.False(oneMeter > twoMeters);
57-
Assert.False(oneMeter >= twoMeters);
58-
Assert.False(twoMeters < oneMeter);
59-
Assert.False(twoMeters <= oneMeter);
60-
}
61-
62-
[Test]
63-
public void CompareToIsImplemented()
64-
{
65-
Flow oneCmps = Flow.FromCubicMetersPerSecond(1);
66-
Assert.AreEqual(0, oneCmps.CompareTo(oneCmps));
67-
Assert.Greater(oneCmps.CompareTo(Flow.Zero), 0);
68-
Assert.Less(Flow.Zero.CompareTo(oneCmps), 0);
69-
}
70-
71-
[Test]
72-
[ExpectedException(typeof(ArgumentException))]
73-
public void CompareToThrowsOnTypeMismatch()
74-
{
75-
Flow oneCmps = Flow.FromCubicMetersPerSecond(1);
76-
// ReSharper disable once ReturnValueOfPureMethodIsNotUsed
77-
oneCmps.CompareTo(new object());
78-
}
79-
80-
[Test]
81-
[ExpectedException(typeof(ArgumentNullException))]
82-
public void CompareToThrowsOnNull()
83-
{
84-
Flow oneCmps = Flow.FromCubicMetersPerSecond(1);
85-
// ReSharper disable once ReturnValueOfPureMethodIsNotUsed
86-
oneCmps.CompareTo(null);
87-
}
88-
89-
90-
[Test]
91-
public void EqualityOperators()
92-
{
93-
Flow a = Flow.FromCubicMetersPerSecond(1);
94-
Flow b = Flow.FromCubicMetersPerSecond(2);
95-
96-
// ReSharper disable EqualExpressionComparison
97-
Assert.True(a == a);
98-
Assert.True(a != b);
99-
100-
Assert.False(a == b);
101-
Assert.False(a != a);
102-
// ReSharper restore EqualExpressionComparison
103-
}
104-
105-
[Test]
106-
public void EqualsIsImplemented()
107-
{
108-
Flow v = Flow.FromCubicMetersPerSecond(1);
109-
Assert.IsTrue(v.Equals(Flow.FromCubicMetersPerSecond(1)));
110-
Assert.IsFalse(v.Equals(Flow.Zero));
111-
}
112-
113-
[Test]
114-
public void EqualsReturnsFalseOnTypeMismatch()
11+
protected override double CubicMetersPerHourInOneCubicMeterPerSecond
11512
{
116-
Flow oneCmps = Flow.FromCubicMetersPerSecond(1);
117-
Assert.IsFalse(oneCmps.Equals(new object()));
13+
get { return 1/3600.0; }
11814
}
11915

120-
[Test]
121-
public void EqualsReturnsFalseOnNull()
16+
protected override double CubicMetersPerSecondInOneCubicMeterPerSecond
12217
{
123-
Flow oneCmps = Flow.FromCubicMetersPerSecond(1);
124-
Assert.IsFalse(oneCmps.Equals(null));
18+
get { return 1; }
12519
}
12620
}
12721
}

0 commit comments

Comments
 (0)