Skip to content

K voland #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
K-Voland wants to merge 26 commits into
base: K-Voland
Choose a base branch
from
Open

K voland #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
47093d1
lab_2
K-Voland Oct 16, 2018
e42b7eb
lab_2_2
K-Voland Oct 30, 2018
88c17a6
lab_2_3
K-Voland Oct 30, 2018
3686c4a
lab_3
K-Voland Nov 11, 2018
1057aa6
lab_3m
K-Voland Nov 12, 2018
0a6739a
lab_4
K-Voland Nov 25, 2018
297b5d6
lab_4_1
K-Voland Nov 26, 2018
addc7cc
lab_4_2_ujas
K-Voland Dec 1, 2018
e3d4d8e
lab_4_3
K-Voland Dec 2, 2018
75548ba
lab_4_4
K-Voland Dec 2, 2018
40078f8
lab_4_5
K-Voland Dec 2, 2018
2f38d04
lab_4_6
K-Voland Dec 2, 2018
e24d1da
lab_4_7
K-Voland Dec 3, 2018
9e27494
lab_4_8
K-Voland Dec 4, 2018
3390c59
lab_4_9
K-Voland Dec 7, 2018
9969670
Added stylecop for project
jskonst Dec 9, 2018
c4a7f5d
Added stylecop for project
jskonst Dec 11, 2018
a863fda
lab_4_10
K-Voland Dec 11, 2018
2cd9e2a
lab_4_slom
K-Voland Dec 15, 2018
2a6774d
lab_4_11_slom
K-Voland Dec 15, 2018
69539c1
lab_4_11M
K-Voland Dec 15, 2018
09cd8ff
lab_5_1
K-Voland Dec 18, 2018
2056920
lab_5_2
K-Voland Dec 23, 2018
76833e2
changed logic
jskonst Dec 29, 2018
2d2bd84
Merge pull request #1 from jskonst/K-Voland
K-Voland Jan 12, 2019
90f087e
lab_6_No_work
K-Voland Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions CourseApp.Tests/CourseApp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<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="15.9.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<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>
33 changes: 33 additions & 0 deletions CourseApp.Tests/DateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System;
using Xunit;
using CourseApp;

namespace CourseApp.Tests
{
public class DateTest
{
[Fact]
public void Test1()
{
DateTime dr = new DateTime(1990, 9, 17);
var time = Date.DateB(dr);
Assert.Equal("Год: 28 Месяц: 05 День: 20", Date.DateB(dr));
}

[Fact]
public void Test2()
{
DateTime dr = new DateTime(2010, 2, 2);
var time = Date.DateB(dr);
Assert.Equal("Год: 09 Месяц: 01 День: 04", Date.DateB(dr));
}

[Fact]
public void Test3()
{
DateTime dr = new DateTime(11, 11, 11);
var time = Date.DateB(dr);
Assert.Equal("Год: 07 Месяц: 03 День: 26", Date.DateB(dr));
}
}
}
14 changes: 14 additions & 0 deletions CourseApp.Tests/DemoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using Xunit;

namespace CourseApp.Tests
{
public class DemoTest
{
[Fact]
public void Test1()
{
Assert.True(true);
}
}
}
58 changes: 58 additions & 0 deletions CourseApp.Tests/UnitTest1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using System;
using Xunit;
using CourseApp;

namespace CourseApp.Tests
{
public class UnitTest1
{

[Fact]
public void Test1()
{
var res = Program.Fan(0.7,1.2,0.48);
Assert.Equal(0.326, res, 3);
}

[Fact]
public void Test2()
{
var res = Program.Fan(1.0,1.2,0.48);
Assert.Equal(0.584, res, 3);
}

[Fact]
public void Test3()
{
var res = Program.Fan(1.3,1.2,0.48);
Assert.Equal(0.968, res, 3);
}

[Fact]
public void Test4()
{
var res = Program.Fan(1.6,1.2,0.48);
Assert.Equal(Double.NaN, res, 3);
}

[Fact]
public void Test5()
{
var res = Program.Fan(1.9,1.2,0.48);
Assert.Equal(Double.NaN, res, 3);
}

double[] xx = {0.25, 0.36, 0.56, 0.94, 1.28};

[Fact]
public void Test6()
{
double[] o = new double[5] {0.082,0.122,0.229,0.528,0.930};
foreach (int i in xx)
{
var res = Program.Fan(xx[i],1.2,0.48);
Assert.Equal(o[i], res, 3);
}
}
}
}
82 changes: 82 additions & 0 deletions CourseApp.Tests/UnitTest2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
using System;
using Xunit;
using CourseApp;
using System.Collections.Generic;
using System.Collections;

namespace CourseApp.Tests
{
public class UnitTest2
{
[Fact]
public void Test1()
{
var krosh = new InfoRabbit();
var N ="momo";
krosh.RabbitInfo(N);
Assert.Equal("momo",N);
Copy link
Contributor

@jskonst jskonst Dec 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

этот тест не проверяет ващ класс - он только проверяет что переменная N, объявленная в тесте = "momo"

}
[Fact]
public void Test2()
{
var krosh = new InfoRabbit();
var N ="momo";
var P1 = "mu";
var P2 = "nu";
krosh.RabbitInfo(N);
Assert.Equal("momo",N);
Copy link
Contributor

@jskonst jskonst Dec 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Та же беда - вы проверяете не свойство класса, а проверяете значение переменных, которые объявлены в тесте

Assert.Equal("mu",P1);
Assert.Equal("nu",P2);
}
[Fact]
public void Test3()
{
var krosh = new InfoRabbit();
var N ="momo";
var P1 = "mu";
var P2 = "nu";
List<string> ch=new List<string> {"Mura","Gura","Fedya"};
krosh.RabbitInfo(N,P1,P2,ch);
Assert.Equal("momo",N);
Assert.Equal("mu",P1);
Assert.Equal("nu",P2);
Assert.Equal("Mura",ch[0]);
Assert.Equal("Gura",ch[1]);
Assert.Equal("Fedya",ch[2]);
}
[Fact]
public void Test4()
{
Menu ferma = new Menu();
ferma.Name = "Boo";
Assert.Equal("Boo",ferma.Name);
} [Fact]
public void Test5()
{
Menu ferma = new Menu();
ferma.klet.Add("Boo");
Assert.Equal("Boo",ferma.klet[0]);
}
[Fact]
public void Test6()
{
Menu ferma = new Menu();
ferma.menu("Stl");
ferma.Name="Boo";
ferma.Pearent1="Buu";
ferma.Pearent2="Buuu";
Assert.Equal("Boo",ferma.klet[0]);
Assert.Equal("Buu",ferma.klet[0]);
Assert.Equal("Buuu",ferma.klet[0]);
}
[Fact]
public void Test7()
{
Menu ferma = new Menu();
var go="heip";
var osh="Такой команды не существует. help - узнать список команд.";
ferma.menu(go);
Assert.Equal(osh);
}
}
}
36 changes: 36 additions & 0 deletions CourseApp/Cavy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System;
using System.Collections;
using System.Collections.Generic;

namespace CourseApp
{
public class Cavy : Pet
{
public override void NewPet()
Copy link
Contributor

@jskonst jskonst Dec 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Опять же это теперь делает базовый класс, можно убирать

{
Console.Write("Введите имя новорожденной морской свинки: ");
Copy link
Contributor

@jskonst jskonst Dec 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Осуществлять пользовательский ввод тоже не надо в классах, которые представляют сущности

Name = Console.ReadLine();
Copy link
Contributor

@jskonst jskonst Dec 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вот для всего этого есть порождающий паттерн фабрика. или фабричный метод - как раз для реализации вашей идеи

Console.WriteLine("Введите имена родителй морской свинки: ");
Copy link
Contributor

@jskonst jskonst Dec 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А саму логику создания и внесения родителей следует унести в конструктор класса

Pearent1 = Console.ReadLine();
Pearent2 = Console.ReadLine();
Spisok.Add(Name, new NewPet(Pearent1, Pearent2, "cavy"));
foreach(string i in Spisok.Keys)
{
if(Pearent1 == i )
{
Spisok.Add(Pearent1, new NewPet(Name, "cavy"));
}

if(Pearent2 == i)
{
Spisok.Add(Pearent2, new NewPet(Name, "cavy"));
}
}
}

public override string GetInfo()
{
return $"Морская свинка: {Name} ";
}
}
}
15 changes: 15 additions & 0 deletions CourseApp/CourseApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>1573,1591,1701;1702;1705</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
</ItemGroup>

<PropertyGroup>
<CodeAnalysisRuleSet>../stylecop/stylecop.ruleset</CodeAnalysisRuleSet>
<GenerateFullPaths>true</GenerateFullPaths>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="../stylecop/stylecop.json" />
</ItemGroup>

</Project>
12 changes: 12 additions & 0 deletions CourseApp/Date.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;

namespace CourseApp
{
public class Date
{
public static string DateB(DateTime dr)
{
return DateTime.Today.AddYears(-dr.Year).AddMonths(-dr.Month).AddDays(-dr.Day).ToString("Год: yy Месяц: MM День: dd");
}
}
}
37 changes: 37 additions & 0 deletions CourseApp/Krolik.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using System;
using System.Collections;
using System.Collections.Generic;

namespace CourseApp
{
public class Krolik : Pet
{

public override void NewPet()
Copy link
Contributor

@jskonst jskonst Dec 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это теперь делает базовый класс, только передавайте

{
Console.Write("Введите имя новорожденного кролика: ");
Copy link
Contributor

@jskonst jskonst Dec 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

то же самое - вынесите в основную программу получение параметров, а здесь, только их проверьте

Name = Console.ReadLine();
Console.WriteLine("Введите имена родителй кролика: ");
Pearent1 = Console.ReadLine();
Pearent2 = Console.ReadLine();
Spisok.Add(Name, new NewPet(Pearent1, Pearent2, "rabbit"));
foreach(string i in Spisok.Keys)
{
if(Pearent1 == i )
{
Spisok.Add(Pearent1, new NewPet(Name, "rabbit"));
}

if(Pearent2 == i)
{
Spisok.Add(Pearent2, new NewPet(Name, "rabbit"));
}
}
}

public override string GetInfo()
{
return $"Кролик: {Name} ";
}
}
}
Loading