Added unit test, refactored the code

ISUCT · Oct 14, 2020 · b327fd7 · b327fd7
1 parent d603784
commit b327fd7
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 22 deletions.
diff --git a/CourseApp.Tests/CourseApp.Tests.csproj b/CourseApp.Tests/CourseApp.Tests.csproj
@@ -2,15 +2,29 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <NoWarn>1573,1591,1701;1702;1705</NoWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.0.1" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CourseApp\CourseApp.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>../_stylecop/stylecop.ruleset</CodeAnalysisRuleSet> 
+    <GenerateFullPaths>true</GenerateFullPaths>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="../_stylecop/stylecop.json" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/CourseApp.Tests/DemoTest.cs b/CourseApp.Tests/DemoTest.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace CourseApp.Tests
+{
+    public class DemoTest
+    {
+        [Fact]
+        public void Test1()
+        {
+            Assert.True(true);
+        }
+
+        [Fact]
+        public void TestMyFunctionZeros()
+        {
+            var res = Program.Сalculation(0.0, 0.0, 0.0).Count;
+            Assert.Equal(double.NaN, res);
+        }
+
+        [Fact]
+        public void TestNullB()
+        {
+            List<double> e = new List<double>();
+            var res = Program.Сalculation2(e).Count;
+            Assert.Equal(double.NaN, res);
+        }
+
+        [Fact]
+        public void TestTrueA()
+        {
+            var res = Program.Сalculation(0.26, 0.66, 0.08);
+            List<double> result = new List<double>() { 0.834215045903759, 0.75429795697566, 0.688425423366074, 0.652365112574963, 0.663883187692699, 0.751251000538057 };
+            Assert.Equal(result, res);
+        }
+
+        [Fact]
+        public void TestTrueB()
+        {
+            List<double> input = new List<double>() { 0.1, 0.35, 0.4, 0.55, 0.6 };
+            var res = Program.Сalculation2(input);
+            List<double> result = new List<double>() { 0.970885488727385, 0.744968715506544, 0.702712806929317, 0.65257962383342, 0.677063603240845 };
+            Assert.Equal(res, result);
+        }
+    }
+}
diff --git a/CourseApp.Tests/UnitTest1.cs b/CourseApp.Tests/UnitTest1.cs
diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs
@@ -12,22 +12,30 @@ public static double Mathhh(double x)
             return y;
         }
 
-        public static void Сalculation(double xH, double xK, double dx)
+        public static List<double> Сalculation(double xH, double xK, double dx)
         {
             int i = 0;
+            List<double> output = new List<double>();
             for (double x = xH; x <= xK; x = x + dx)
             {
-                Console.WriteLine("{0} ", Mathhh(x));
+                output.Add(Mathhh(x));
+                Console.WriteLine(Mathhh(x));
                 i++;
             }
+
+            return output;
         }
 
-        public static void Сalculation2(List<double> b)
+        public static List<double> Сalculation2(List<double> b)
         {
+            List<double> output = new List<double>();
             foreach (double i in b)
             {
-               Console.WriteLine("{0} ", Mathhh(i));
+               output.Add(Mathhh(i));
+               Console.WriteLine(Mathhh(i));
             }
+
+            return output;
         }
 
         public static void Main()