Przeglądaj źródła

все готово

Алёна Плотникова 3 lat temu
rodzic
commit
15204e46e3

+ 16 - 0
TestProject/App.config

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+		<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+		<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+	</configSections>
+	<connectionStrings>
+		<add name="numbersystemEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-SQEIV9O4\SQLEXPRESS;initial catalog=numbersystem;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+	</connectionStrings>
+	<entityFramework>
+		<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+		<providers>
+			<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+		</providers>
+	</entityFramework>
+</configuration>

+ 28 - 0
TestProject/TestProject.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <Nullable>disable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\numbersystem\numbersystem.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+
+</Project>

+ 71 - 0
TestProject/UnitTest1.cs

@@ -0,0 +1,71 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using numbersystem;
+
+namespace TestProject
+{
+    [TestClass]
+    public class UnitTest
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+            MainWindow page = new MainWindow();
+
+            string Exp, Res;
+
+            // êîððåêòíûå äàííûå
+            // 2 ÑÑ
+            // 1 ïðèìåð
+            Exp = "10010110";
+            Res = page.TestNS(2, "1010 * 1111");
+            Assert.AreEqual(Exp, Res);
+
+            // 2 ïðèìåð
+            Exp = "11111111111111111111111111011111";
+            Res = page.TestNS(2, "1010 + 111 - 10 * 11001");
+            Assert.AreEqual(Exp, Res);
+
+            // 3 ïðèìåð
+            Exp = "10";
+            Res = page.TestNS(2, "111111 / 1011 % 11");
+            Assert.AreEqual(Exp, Res);
+
+            // 8 ÑÑ
+            // 4 ïðèìåð
+            Exp = "325";
+            Res = page.TestNS(8, "701 - 354");
+            Assert.AreEqual(Exp, Res);
+
+            // 5 ïðèìåð
+            Exp = "71705";
+            Res = page.TestNS(8, "4663 - 123 + 7463 * 7");
+            Assert.AreEqual(Exp, Res);
+
+            // 6 ïðèìåð
+            Exp = "0";
+            Res = page.TestNS(8, "102 % 2 / 30");
+            Assert.AreEqual(Exp, Res);
+
+            // 16 ÑÑ
+            // 7 ïðèìåð
+            Exp = "7c3e";
+            Res = page.TestNS(16, "ab * ba");
+            Assert.AreEqual(Exp, Res);
+
+            // 8 ïðèìåð
+            Exp = "1df1";
+            Res = page.TestNS(16, "f12 + f13 - 34");
+            Assert.AreEqual(Exp, Res);
+
+            // 9 ïðèìåð
+            Exp = "0";
+            Res = page.TestNS(16, "f % 2 / 5");
+            Assert.AreEqual(Exp, Res);
+
+            // 10 ïðèìåð
+            Exp = "";
+            Res = page.TestNS(0, "10101 - 100");
+            Assert.AreEqual(Exp, Res);
+        }
+    }
+}

+ 8 - 7
UnitTestProject/UnitTestProject.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTestProject</RootNamespace>
     <AssemblyName>UnitTestProject</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -20,6 +20,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,10 +41,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -70,8 +71,8 @@
     <PropertyGroup>
       <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их.  Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.8\build\net45\MSTest.TestAdapter.targets')" />
 </Project>

+ 2 - 2
UnitTestProject/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="2.2.7" targetFramework="net472" />
-  <package id="MSTest.TestFramework" version="2.2.7" targetFramework="net472" />
+  <package id="MSTest.TestAdapter" version="2.2.8" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="2.2.8" targetFramework="net472" />
 </packages>

+ 5 - 5
numbersystem.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "numbersystem", "numbersystem\numbersystem.csproj", "{64379BA7-F7D5-4318-A174-21F1BF9FF92E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestProject", "UnitTestProject\UnitTestProject.csproj", "{ED2CE15B-F12A-48AD-B736-3EAFCF217A42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{32734A4F-B205-46BC-95CE-33BD619DC824}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
 		{64379BA7-F7D5-4318-A174-21F1BF9FF92E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64379BA7-F7D5-4318-A174-21F1BF9FF92E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64379BA7-F7D5-4318-A174-21F1BF9FF92E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED2CE15B-F12A-48AD-B736-3EAFCF217A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED2CE15B-F12A-48AD-B736-3EAFCF217A42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED2CE15B-F12A-48AD-B736-3EAFCF217A42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED2CE15B-F12A-48AD-B736-3EAFCF217A42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32734A4F-B205-46BC-95CE-33BD619DC824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32734A4F-B205-46BC-95CE-33BD619DC824}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32734A4F-B205-46BC-95CE-33BD619DC824}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32734A4F-B205-46BC-95CE-33BD619DC824}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 1 - 1
numbersystem/App.config

@@ -8,7 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <connectionStrings>
-    <add name="numbersystemEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-SQEIV9O4\SQLEXPRESS;initial catalog=numbersystem;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+	  <add name="numbersystemEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-SQEIV9O4\SQLEXPRESS;initial catalog=numbersystem;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>

+ 1 - 1
numbersystem/MainWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
         xmlns:local="clr-namespace:numbersystem" 
         mc:Ignorable="d"
-        Title="Система счислений" Height="550" Width="350" ResizeMode="NoResize" Icon="/icon.png" FontFamily="Montserrat Light">
+        Title="Система счислений" Height="550" Width="350" ResizeMode="NoResize" FontFamily="Montserrat Light" Icon="/icon.png">
     <Window.Resources>
         <Style TargetType="Button">
             <Style.Setters>

+ 0 - 1
numbersystem/MainWindow.xaml.cs

@@ -294,7 +294,6 @@ namespace numbersystem
                 {
                     if (ss == 0)
                     {
-                        MessageBox.Show("Не выбрана система счисления");
                         return result;
                     }