Tests: Adapt to new PaymentBillingData class usage

This commit is contained in:
2024-01-18 21:23:10 +01:00
parent b32a935150
commit 8fbce03031
2 changed files with 11 additions and 10 deletions

View File

@ -70,6 +70,7 @@ namespace Elwig.Helpers.Billing {
protected Dictionary<string, Curve> GetQualityData() { protected Dictionary<string, Curve> GetQualityData() {
Dictionary<string, Curve> dict = []; Dictionary<string, Curve> dict = [];
var q = GetQualityEntry(); var q = GetQualityEntry();
if (q == null) return dict;
foreach (var (qualid, data) in q) { foreach (var (qualid, data) in q) {
Dictionary<string, Curve> qualDict; Dictionary<string, Curve> qualDict;

View File

@ -26,14 +26,14 @@ namespace Tests.Helpers {
}; };
} }
private static void TestCalcOe(BillingData data, string bucket, double oe, decimal expected, string? qualid = null, bool geb = false) { private static void TestCalcOe(PaymentBillingData data, string bucket, double oe, decimal expected, string? qualid = null, bool geb = false) {
var (sortid, attrid) = GetSortIdAttrId(bucket); var (sortid, attrid) = GetSortIdAttrId(bucket);
var kmw = Utils.OeToKmw(oe); var kmw = Utils.OeToKmw(oe);
var v = data.CalculatePrice(sortid, attrid, qualid ?? GetQualId(kmw), geb, oe, kmw); var v = data.CalculatePrice(sortid, attrid, qualid ?? GetQualId(kmw), geb, oe, kmw);
Assert.That(Math.Round(v, 6), Is.EqualTo(expected)); Assert.That(Math.Round(v, 6), Is.EqualTo(expected));
} }
private static void TestCalcKmw(BillingData data, string bucket, double kmw, decimal expected, string? qualid = null, bool geb = false) { private static void TestCalcKmw(PaymentBillingData data, string bucket, double kmw, decimal expected, string? qualid = null, bool geb = false) {
var (sortid, attrid) = GetSortIdAttrId(bucket); var (sortid, attrid) = GetSortIdAttrId(bucket);
var oe = Utils.KmwToOe(kmw); var oe = Utils.KmwToOe(kmw);
var v = data.CalculatePrice(sortid, attrid, qualid ?? GetQualId(kmw), geb, oe, kmw); var v = data.CalculatePrice(sortid, attrid, qualid ?? GetQualId(kmw), geb, oe, kmw);
@ -42,7 +42,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_01_Flatrate() { public void Test_01_Flatrate() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -58,7 +58,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_02_Simple() { public void Test_02_Simple() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -93,7 +93,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_03_GreaterThanAndLessThan() { public void Test_03_GreaterThanAndLessThan() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -132,7 +132,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_04_VariantsAndAttributes() { public void Test_04_VariantsAndAttributes() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -162,7 +162,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_05_QualityLevel() { public void Test_05_QualityLevel() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -193,7 +193,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_06_ModeOeAndKmw() { public void Test_06_ModeOeAndKmw() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -235,7 +235,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_07_MultipleCurves() { public void Test_07_MultipleCurves() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "elwig", "mode": "elwig",
"version": 1, "version": 1,
@ -304,7 +304,7 @@ namespace Tests.Helpers {
[Test] [Test]
public void Test_08_WgMaster() { public void Test_08_WgMaster() {
var data = BillingData.FromJson(""" var data = PaymentBillingData.FromJson("""
{ {
"mode": "wgmaster", "mode": "wgmaster",
"Grundbetrag": 0.033, "Grundbetrag": 0.033,