feladat2 fix 1 + feladat7 start

This commit is contained in:
Damimani 2026-11-20 17:54:51 +01:00
parent 6ca06962d9
commit 3bd4b31b23
18 changed files with 407 additions and 35 deletions

View file

@ -1,4 +1,4 @@
//Tóth Dániel Mátyás | IFPQYY | v2
//Tóth Dániel Mátyás | IFPQYY | v3
#include "pch.h"
#include "CppUnitTest.h"
#include "feladat2.h"
@ -151,6 +151,50 @@ namespace UnitTest1
Assert::AreEqual(4, capacity());
}
TEST_METHOD(RegularOperationTest) {
destroyfifo();
createfifo(6);
push('a');
push('b');
push('c');
push('d');
push('e');
push('f');
Assert::AreEqual(6, capacity());
Assert::AreEqual(0, freespace());
Assert::AreEqual('a', (char)pop());
Assert::AreEqual('b', (char)pop());
Assert::AreEqual('c', (char)pop());
Assert::AreEqual(6, capacity());
Assert::AreEqual(3, freespace());
destroyfifo();
}
TEST_METHOD(SpecialCase1) {//stolen straight from the email
destroyfifo();
createfifo(3);
push(0);
push(1);
push(2);
Assert::AreEqual(3, capacity());
Assert::AreEqual(0, freespace());
Assert::AreEqual(0, pop());
Assert::AreEqual(OK, push((char)255));
Assert::AreEqual(3, capacity());
Assert::AreEqual(0, freespace());
Assert::AreEqual(1, pop());
}
};
}

View file

@ -77,7 +77,8 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>C:\Users\danit\Desktop\cpp\feladat2\feladat2\feladat2;C:\Users\danit\Desktop\cpp\feladat2\feladat2;$(IncludePath)</IncludePath>
<ReferencePath>C:\Users\danit\Desktop\2026-27-cpp-homework\feladat2\feladat2;$(ReferencePath)</ReferencePath>
<IncludePath>C:\Users\danit\Desktop\2026-27-cpp-homework\feladat2\feladat2;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
@ -143,7 +144,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>C:\Users\danit\Desktop\cpp\feladat2\feladat2\feladat2\x64\Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\Users\danit\Desktop\2026-27-cpp-homework\feladat2\feladat2\x64\Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>feladat2;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@ -182,8 +183,8 @@
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\feladat2\feladat2\feladat2.vcxproj">
<Project>{c0af2585-3697-4ad9-bd3a-67823343a675}</Project>
<ProjectReference Include="..\feladat2\feladat2.vcxproj">
<Project>{6c528726-81ac-44ca-9c09-f9fde7941386}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View file

@ -3,6 +3,6 @@
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Project Path="feladat2/feladat2/feladat2.vcxproj" Id="c0af2585-3697-4ad9-bd3a-67823343a675" />
<Project Path="feladat2/feladat2.vcxproj" />
<Project Path="UnitTest1/UnitTest1.vcxproj" />
</Solution>

Binary file not shown.

View file

@ -0,0 +1,200 @@
//Tóth Dániel Mátyás | IFPQYY | v3
#include "pch.h"
#include "CppUnitTest.h"
#include "feladat2.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace UnitTest1
{
TEST_CLASS(UnitTest1)
{
public:
//Works weirdly, seems like the test methods are not isolated in themselves in this instance, will need to create and destroy in every
//seperate test to guarantee they will work as intended. If only these were in classes instead of being global.....
TEST_METHOD(CreateTest1)
{
destroyfifo();
Assert::AreEqual(OK, createfifo(10));
destroyfifo();
}
TEST_METHOD(CreateTest2)
{
createfifo(10);
Assert::AreEqual(NOK, createfifo(10));
destroyfifo();
}
TEST_METHOD(DestroyTest1)
{
createfifo(10);
Assert::AreEqual(OK, destroyfifo());
}
TEST_METHOD(DestroyTest2)
{
destroyfifo();
Assert::AreEqual(NOK, destroyfifo());
}
TEST_METHOD(PushTest1)
{
destroyfifo();
createfifo(10);
Assert::AreEqual(OK, push('c'));
destroyfifo();
}
TEST_METHOD(PopTest1)
{
destroyfifo();
createfifo(10);
push('c');
Assert::AreEqual('c', (char)pop());
destroyfifo();
}
TEST_METHOD(PopTest2)
{
destroyfifo();
createfifo(10);
Assert::AreEqual(NOK, pop());
destroyfifo();
}
TEST_METHOD(PopTest3)
{
destroyfifo();
createfifo(10);
push('c');
Assert::AreEqual('c', (char)pop());
Assert::AreEqual(NOK, pop());
destroyfifo();
}
TEST_METHOD(PeekTest1)
{
destroyfifo();
createfifo(10);
push('c');
Assert::AreEqual('c', (char)peek());
Assert::AreEqual('c', (char)peek());
destroyfifo();
}
TEST_METHOD(PeekTest2)
{
destroyfifo();
createfifo(10);
Assert::AreEqual(NOK, pop());
destroyfifo();
}
TEST_METHOD(FreespaceTest1)
{
destroyfifo();
int s = 5;
createfifo(s);
for (int i = 0; i < s; i++)
{
push('t');
}
Assert::AreEqual(0, freespace());
destroyfifo();
}
TEST_METHOD(FreespaceTest2)
{
destroyfifo();
int s = 5;
createfifo(s);
for (int i = 0; i < s-1; i++)
{
push('t');
}
Assert::AreEqual(1, freespace());
destroyfifo();
}
TEST_METHOD(CapacityTest1)
{
destroyfifo();
int s = 5;
createfifo(s);
Assert::AreEqual(s, capacity());
destroyfifo();
}
TEST_METHOD(CapacityTest2)
{
destroyfifo();
int s = 5;
createfifo(s);
push('c');
Assert::AreEqual(s, capacity());
destroyfifo();
}
TEST_METHOD(ClearTest1)
{
destroyfifo();
createfifo(10);
push('c');
Assert::AreEqual(OK, clearfifo());
Assert::AreEqual(NOK, pop());
Assert::AreEqual(NOK, peek());
destroyfifo();
}
TEST_METHOD(ClearTest2)
{
destroyfifo();
Assert::AreEqual(NOK, clearfifo());
}
TEST_METHOD(EnlargeTest)
{
destroyfifo();
createfifo(2); //2
push('c'); //1
push('a'); //0
push('d'); //doubles
Assert::AreEqual(4, capacity());
}
TEST_METHOD(RegularOperationTest) {
destroyfifo();
createfifo(6);
push('a');
push('b');
push('c');
push('d');
push('e');
push('f');
Assert::AreEqual(6, capacity());
Assert::AreEqual(0, freespace());
Assert::AreEqual('a', (char)pop());
Assert::AreEqual('b', (char)pop());
Assert::AreEqual('c', (char)pop());
Assert::AreEqual(6, capacity());
Assert::AreEqual(3, freespace());
destroyfifo();
}
TEST_METHOD(SpecialCase1) {//stolen straight from the email
destroyfifo();
createfifo(3);
push(0);
push(1);
push(2);
Assert::AreEqual(3, capacity());
Assert::AreEqual(0, freespace());
Assert::AreEqual(0, pop());
Assert::AreEqual(OK, push((char)255));
Assert::AreEqual(3, capacity());
Assert::AreEqual(0, freespace());
Assert::AreEqual(1, pop());
}
};
}

View file

@ -1,4 +1,4 @@
//Tóth Dániel Mátyás | IFPQYY | v2
//Tóth Dániel Mátyás | IFPQYY | v3
#include <cstdio>
#include <stdlib.h>
#include "feladat2.h"
@ -85,6 +85,7 @@ int pop(void) {
}
int ret = fifo[tail];
tail = (tail + 1) % lngt;
full = false;
return ret;
}
@ -105,7 +106,7 @@ int freespace(void) {
if (full) {
return 0;
}
return lngt - ((head - tail + lngt) % lngt);
return (tail - head + lngt) % lngt;
}
int capacity(void) {

View file

@ -1,4 +1,4 @@
//Tóth Dániel Mátyás | IFPQYY | v2
//Tóth Dániel Mátyás | IFPQYY | v3
#pragma once
#define OK 0
#define NOK -1

View file

@ -18,17 +18,10 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\Downloads\feladat2\feladat2.cpp" />
<ClCompile Include="..\..\..\..\Downloads\feladat2\main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\Downloads\feladat2\feladat2.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>18.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{a2f27c2b-a860-44db-b1ea-4fa4467bd633}</ProjectGuid>
<ProjectGuid>{6c528726-81ac-44ca-9c09-f9fde7941386}</ProjectGuid>
<RootNamespace>feladat2</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
@ -145,6 +138,13 @@
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="feladat2.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="feladat2.cpp" />
<ClCompile Include="main.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View file

@ -15,16 +15,16 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\Downloads\feladat2\feladat2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Downloads\feladat2\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\Downloads\feladat2\feladat2.h">
<ClInclude Include="feladat2.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="feladat2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View file

@ -1,151 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>18.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{c0af2585-3697-4ad9-bd3a-67823343a675}</ProjectGuid>
<RootNamespace>feladat2</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v145</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v145</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<EnableSegmentHeap>true</EnableSegmentHeap>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\feladat2.cpp" />
<ClCompile Include="..\main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\feladat2.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\feladat2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\feladat2.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

View file

@ -1,4 +1,4 @@
//Tóth Dániel Mátyás | IFPQYY | v2
//Tóth Dániel Mátyás | IFPQYY | v3
#include <stdio.h>
#include "feladat2.h"