From f366bdfa47ff570301ab0e4e167d9c217c770178 Mon Sep 17 00:00:00 2001
From: vesal <vesal@jyu.fi>
Date: Mon, 23 Oct 2023 10:36:39 +0300
Subject: [PATCH] demophjat test
---
demopohjat/demo7/TaulukotTest/TaulukotTest.cs | 41 +++++++++
.../demo7/TaulukotTest/TaulukotTest.csproj | 15 ++++
demopohjat/demo7/Tauno7Test/Tauno7Test.cs | 18 ++++
demopohjat/demo7/Tauno7Test/Tauno7Test.csproj | 15 ++++
demopohjat/demo7/demo7.sln | 87 +++++++++++--------
demopohjat/demo7/demo7.sln.ctbackup | 55 ++++++++++++
6 files changed, 193 insertions(+), 38 deletions(-)
create mode 100644 demopohjat/demo7/TaulukotTest/TaulukotTest.cs
create mode 100644 demopohjat/demo7/TaulukotTest/TaulukotTest.csproj
create mode 100644 demopohjat/demo7/Tauno7Test/Tauno7Test.cs
create mode 100644 demopohjat/demo7/Tauno7Test/Tauno7Test.csproj
create mode 100644 demopohjat/demo7/demo7.sln.ctbackup
diff --git a/demopohjat/demo7/TaulukotTest/TaulukotTest.cs b/demopohjat/demo7/TaulukotTest/TaulukotTest.cs
new file mode 100644
index 0000000..ae22804
--- /dev/null
+++ b/demopohjat/demo7/TaulukotTest/TaulukotTest.cs
@@ -0,0 +1,41 @@
+// ReSharper disable all
+using System;
+using System.Text.RegularExpressions;
+using System.Globalization;
+using NUnit.Framework;
+using static Demo7.Taulukot;
+using Demo7;
+
+namespace TestDemo7
+{
+ [TestFixture]
+ [DefaultFloatingPointTolerance(0.000001)]
+ public class TestTaulukot
+ {
+ [Test]
+ public void TestErotaDouble32()
+ {
+ Assert.AreEqual( 0.0, ErotaDouble("") , 0.000001, "in method ErotaDouble, line 33");
+ Assert.AreEqual( 2.0, ErotaDouble("",2) , 0.000001, "in method ErotaDouble, line 34");
+ Assert.AreEqual( 2.3, ErotaDouble(" 2.3 ") , 0.000001, "in method ErotaDouble, line 35");
+ Assert.AreEqual( 5, ErotaDouble("5 3") , 0.000001, "in method ErotaDouble, line 36");
+ Assert.AreEqual( 5, ErotaDouble("5k3") , 0.000001, "in method ErotaDouble, line 37");
+ Assert.AreEqual( 5000, ErotaDouble("5e3") , 0.000001, "in method ErotaDouble, line 38");
+ Assert.AreEqual( 0.005, ErotaDouble("5E-3") , 0.000001, "in method ErotaDouble, line 39");
+ Assert.AreEqual( 0.0, ErotaDouble("k") , 0.000001, "in method ErotaDouble, line 40");
+ Assert.AreEqual( 1.0, ErotaDouble("k",1.0) , 0.000001, "in method ErotaDouble, line 41");
+ Assert.AreEqual( 0.0, ErotaDouble("2..3") , 0.000001, "in method ErotaDouble, line 42");
+ }
+ [Test]
+ public void TestErota65()
+ {
+ Assert.AreEqual( 0.0, Erota("",0.0) , 0.000001, "in method Erota, line 66");
+ Assert.AreEqual( 2.3, Erota(" 2.3 ",0.0) , 0.000001, "in method Erota, line 67");
+ Assert.AreEqual( 5, Erota("5 3",0.0) , 0.000001, "in method Erota, line 68");
+ Assert.AreEqual( 0.0, Erota("k",0.0) , 0.000001, "in method Erota, line 69");
+ Assert.AreEqual( 1.0, Erota("k",1.0) , 0.000001, "in method Erota, line 70");
+ Assert.AreEqual( 0.0, Erota("2..3",0.0) , 0.000001, "in method Erota, line 71");
+ }
+ }
+}
+
diff --git a/demopohjat/demo7/TaulukotTest/TaulukotTest.csproj b/demopohjat/demo7/TaulukotTest/TaulukotTest.csproj
new file mode 100644
index 0000000..0c730e4
--- /dev/null
+++ b/demopohjat/demo7/TaulukotTest/TaulukotTest.csproj
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>net7.0</TargetFramework>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="NUnit" Version="3.13.1"/>
+ <PackageReference Include="NUnit3TestAdapter" Version="3.17.0"/>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3"/>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Taulukot\Taulukot.csproj"/>
+ </ItemGroup>
+</Project>
diff --git a/demopohjat/demo7/Tauno7Test/Tauno7Test.cs b/demopohjat/demo7/Tauno7Test/Tauno7Test.cs
new file mode 100644
index 0000000..f061f43
--- /dev/null
+++ b/demopohjat/demo7/Tauno7Test/Tauno7Test.cs
@@ -0,0 +1,18 @@
+// ReSharper disable all
+using System;
+using NUnit.Framework;
+using static Tauno7;
+
+ [TestFixture]
+ [DefaultFloatingPointTolerance(0.000001)]
+ public class TestTauno7
+ {
+ [Test]
+ public void TestMuutaYli30()
+ {
+ int[] t = { 72, 22, 73, 2, 16, 62 };
+ Assert.AreEqual( 4, MuutaYli(t,20,0) , "in method MuutaYli, line 32");
+ Assert.AreEqual( "0, 0, 0, 2, 16, 0", String.Join(", ", t) , "in method MuutaYli, line 33");
+ }
+ }
+
diff --git a/demopohjat/demo7/Tauno7Test/Tauno7Test.csproj b/demopohjat/demo7/Tauno7Test/Tauno7Test.csproj
new file mode 100644
index 0000000..4793cca
--- /dev/null
+++ b/demopohjat/demo7/Tauno7Test/Tauno7Test.csproj
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>net7.0</TargetFramework>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="NUnit" Version="3.13.1"/>
+ <PackageReference Include="NUnit3TestAdapter" Version="3.17.0"/>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3"/>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Tauno7\Tauno7.csproj"/>
+ </ItemGroup>
+</Project>
diff --git a/demopohjat/demo7/demo7.sln b/demopohjat/demo7/demo7.sln
index e46ef11..9c1e868 100644
--- a/demopohjat/demo7/demo7.sln
+++ b/demopohjat/demo7/demo7.sln
@@ -1,8 +1,7 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
VisualStudioVersion = 16.0.30503.244
MinimumVisualStudioVersion = 10.0.40219.1
+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tauno72", "Tauno72\Tauno72.csproj", "{AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tauno7", "Tauno7\Tauno7.csproj", "{571DEB93-150B-45F3-885D-BC47F57588FA}"
@@ -15,41 +14,53 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kuvaaja", "Kuvaaja\Kuvaaja.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngryLego", "AngryLego\AngryLego.csproj", "{73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tauno7Test", "Tauno7Test\Tauno7Test.csproj", "{E4E1909D-BBA9-48C7-B73C-6F20811514F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaulukotTest", "TaulukotTest\TaulukotTest.csproj", "{688FA8CE-3414-4861-99B3-F3A38423D9A7}"
+EndProject
Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Release|Any CPU.Build.0 = Release|Any CPU
- {571DEB93-150B-45F3-885D-BC47F57588FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {571DEB93-150B-45F3-885D-BC47F57588FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {571DEB93-150B-45F3-885D-BC47F57588FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {571DEB93-150B-45F3-885D-BC47F57588FA}.Release|Any CPU.Build.0 = Release|Any CPU
- {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Release|Any CPU.Build.0 = Release|Any CPU
- {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Release|Any CPU.Build.0 = Release|Any CPU
- {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Release|Any CPU.Build.0 = Release|Any CPU
- {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {E95C43B3-E5CA-42DE-A29B-97A67C61411B}
- EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E4E1909D-BBA9-48C7-B73C-6F20811514F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E4E1909D-BBA9-48C7-B73C-6F20811514F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E4E1909D-BBA9-48C7-B73C-6F20811514F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E4E1909D-BBA9-48C7-B73C-6F20811514F3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {688FA8CE-3414-4861-99B3-F3A38423D9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {688FA8CE-3414-4861-99B3-F3A38423D9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {688FA8CE-3414-4861-99B3-F3A38423D9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {688FA8CE-3414-4861-99B3-F3A38423D9A7}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {E95C43B3-E5CA-42DE-A29B-97A67C61411B}
+ EndGlobalSection
EndGlobal
diff --git a/demopohjat/demo7/demo7.sln.ctbackup b/demopohjat/demo7/demo7.sln.ctbackup
new file mode 100644
index 0000000..e46ef11
--- /dev/null
+++ b/demopohjat/demo7/demo7.sln.ctbackup
@@ -0,0 +1,55 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30503.244
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tauno72", "Tauno72\Tauno72.csproj", "{AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tauno7", "Tauno7\Tauno7.csproj", "{571DEB93-150B-45F3-885D-BC47F57588FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Taulukot", "Taulukot\Taulukot.csproj", "{FC7C3A03-C61F-4AC7-8223-07994C77CC92}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pisteet", "Pisteet\Pisteet.csproj", "{BED3F0C7-236B-4633-819E-2E4CB4488C56}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kuvaaja", "Kuvaaja\Kuvaaja.csproj", "{E67D9FD2-753B-452C-B31C-38C8330A2DE3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngryLego", "AngryLego\AngryLego.csproj", "{73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AE8D346B-CDF8-410F-9D38-EBE8225BF3AE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {571DEB93-150B-45F3-885D-BC47F57588FA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC7C3A03-C61F-4AC7-8223-07994C77CC92}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BED3F0C7-236B-4633-819E-2E4CB4488C56}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E67D9FD2-753B-452C-B31C-38C8330A2DE3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {73B6CD2B-B9E7-4DB3-B075-C62FD36F18CE}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {E95C43B3-E5CA-42DE-A29B-97A67C61411B}
+ EndGlobalSection
+EndGlobal
--
GitLab