From c8a5824addb4a1dc526cf72a3459116e10986427 Mon Sep 17 00:00:00 2001 From: Serghei Cebotari Date: Thu, 31 Oct 2024 23:31:14 +0300 Subject: Add 40 sleeves and couplings support --- RhSolutions.Tests/CanFillCouplings.cs | 61 ++++++++++----------- RhSolutions.Tests/CanFillSleeves.cs | 16 ++---- .../TestWorkbooks/TestSpecificationCouplings.xlsx | Bin 358618 -> 358149 bytes .../TestWorkbooks/TestSpecificationSleeves.xlsx | Bin 358970 -> 356040 bytes 4 files changed, 34 insertions(+), 43 deletions(-) (limited to 'RhSolutions.Tests') diff --git a/RhSolutions.Tests/CanFillCouplings.cs b/RhSolutions.Tests/CanFillCouplings.cs index 5a57c32..2c6c0bb 100644 --- a/RhSolutions.Tests/CanFillCouplings.cs +++ b/RhSolutions.Tests/CanFillCouplings.cs @@ -5,38 +5,37 @@ namespace RhSolutions.Tests; [ExcelTestSettings(OutOfProcess = true)] public class CanFillCouplings : IDisposable { - private RhSolutionsAddIn _addIn; - private IFittingsCalculator _calculator; - private IReader _reader; - private IWriter _writer; - private Worksheet _worksheet; + private RhSolutionsAddIn _addIn; + private IFittingsCalculator _calculator; + private IReader _reader; + private IWriter _writer; + private Worksheet _worksheet; - public CanFillCouplings() - { - Environment.SetEnvironmentVariable("ISTESTING", "true"); - _addIn = new(); - _addIn.AutoOpen(); - _calculator = new CouplingsCalculator(); - _reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration); - _writer = new CurrentPriceWriter(Util.Application, RhSolutionsAddIn.Configuration); - _worksheet = Util.Workbook.Worksheets[1]; - } + public CanFillCouplings() + { + Environment.SetEnvironmentVariable("ISTESTING", "true"); + _addIn = new(); + _addIn.AutoOpen(); + _calculator = new CouplingsCalculator(); + _reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration); + _writer = new CurrentPriceWriter(Util.Application, RhSolutionsAddIn.Configuration); + _worksheet = Util.Workbook.Worksheets[1]; + } - [ExcelFact(Workbook = @"..\..\..\TestWorkbooks\TestSpecificationCouplings.xlsx")] - public void CanCalculateSleeves() - { - var products = _reader.ReadProducts(new[] { _worksheet }); - var couplings = _calculator.Calculate(products.First().Item2); - _writer.WriteProducts(couplings); + [ExcelFact(Workbook = @"..\..\..\TestWorkbooks\TestSpecificationCouplings.xlsx")] + public void CanCalculateSleeves() + { + var products = _reader.ReadProducts(new[] { _worksheet }); + var couplings = _calculator.Calculate(products.First().Item2); + _writer.WriteProducts(couplings); + for (int i = 2; i < 14; i++) + { + Assert.Equal(_worksheet.Range[$"F{i}"].Value, _worksheet.Range[$"E{i}"].Value); + } + } - Assert.Equal(7, _worksheet.Range["E2"].Value); - Assert.Equal(1, _worksheet.Range["E3"].Value); - Assert.Equal(1, _worksheet.Range["E5"].Value); - Assert.Equal(1, _worksheet.Range["E7"].Value); - } - - public void Dispose() - { - _addIn.AutoClose(); - } + public void Dispose() + { + _addIn.AutoClose(); + } } diff --git a/RhSolutions.Tests/CanFillSleeves.cs b/RhSolutions.Tests/CanFillSleeves.cs index 2fed50c..7d33294 100644 --- a/RhSolutions.Tests/CanFillSleeves.cs +++ b/RhSolutions.Tests/CanFillSleeves.cs @@ -28,18 +28,10 @@ public class CanFillSleeves : IDisposable var products = _reader.ReadProducts(new[] { _worksheet }); var sleeves = _calculator.Calculate(products.First().Item2); _writer.WriteProducts(sleeves); - - Assert.Equal(22, _worksheet.Range["E2"].Value); - Assert.Equal(12, _worksheet.Range["E3"].Value); - Assert.Equal(5, _worksheet.Range["E4"].Value); - Assert.Equal(6, _worksheet.Range["E5"].Value); - Assert.Equal(3, _worksheet.Range["E6"].Value); - Assert.Equal(3, _worksheet.Range["E7"].Value); - Assert.Equal(2, _worksheet.Range["E8"].Value); - Assert.Equal(2, _worksheet.Range["E9"].Value); - Assert.Equal(1, _worksheet.Range["E10"].Value); - Assert.Equal(3, _worksheet.Range["E11"].Value); - Assert.Equal(4, _worksheet.Range["E12"].Value); + for (int i = 2; i < 14; i++) + { + Assert.Equal(_worksheet.Range[$"F{i}"].Value, _worksheet.Range[$"E{i}"].Value); + } } public void Dispose() diff --git a/RhSolutions.Tests/TestWorkbooks/TestSpecificationCouplings.xlsx b/RhSolutions.Tests/TestWorkbooks/TestSpecificationCouplings.xlsx index 77335b9..21135d4 100644 Binary files a/RhSolutions.Tests/TestWorkbooks/TestSpecificationCouplings.xlsx and b/RhSolutions.Tests/TestWorkbooks/TestSpecificationCouplings.xlsx differ diff --git a/RhSolutions.Tests/TestWorkbooks/TestSpecificationSleeves.xlsx b/RhSolutions.Tests/TestWorkbooks/TestSpecificationSleeves.xlsx index f59a74c..13fcb4e 100644 Binary files a/RhSolutions.Tests/TestWorkbooks/TestSpecificationSleeves.xlsx and b/RhSolutions.Tests/TestWorkbooks/TestSpecificationSleeves.xlsx differ -- cgit v1.2.3