diff --git a/Aufgabe3/ConsoleApplication1/ConsoleApplication1.csproj b/Aufgabe3/ConsoleApplication1/ConsoleApplication1.csproj
index dc60efb82ea58a64d93455ba9f9c46f91d00b415..4ba28887aa7075647efc5159679c78adfb73c6ae 100644
--- a/Aufgabe3/ConsoleApplication1/ConsoleApplication1.csproj
+++ b/Aufgabe3/ConsoleApplication1/ConsoleApplication1.csproj
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,6 +34,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\packages\NUnit.3.13.3\lib\net35\nunit.framework.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
@@ -45,8 +49,18 @@
<Compile Include="Producer.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Test\BufferTest.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\build\NUnit.props'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
diff --git a/Aufgabe3/ConsoleApplication1/Consumer.cs b/Aufgabe3/ConsoleApplication1/Consumer.cs
index 87b0d02af8197d25f22d3080292e6bfc9840f05c..aa75b5f8369b2822bd8f024301f16dbecf1741ee 100644
--- a/Aufgabe3/ConsoleApplication1/Consumer.cs
+++ b/Aufgabe3/ConsoleApplication1/Consumer.cs
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Runtime.ConstrainedExecution;
using System.Threading;
@@ -9,8 +10,8 @@ namespace ConsoleApplication1
{
private Buffer _buffer;
private Random _random;
- private Boolean _isAsleep;
- private static Boolean _wakeConsumersUp;
+ private bool _isAsleep;
+ private static bool _wakeConsumersUp;
public Consumer(Buffer buffer)
{
@@ -18,6 +19,7 @@ namespace ConsoleApplication1
_random = new Random();
}
+ [SuppressMessage("ReSharper", "FunctionNeverReturns")]
public void Consume()
{
while (true)
diff --git a/Aufgabe3/ConsoleApplication1/Producer.cs b/Aufgabe3/ConsoleApplication1/Producer.cs
index f9ea5de69076eb8b23b599f2ff9ca302333a2022..eb50ff01e037ec5f186bde01226ab514bdefa612 100644
--- a/Aufgabe3/ConsoleApplication1/Producer.cs
+++ b/Aufgabe3/ConsoleApplication1/Producer.cs
@@ -3,14 +3,13 @@ using System.Threading;
namespace ConsoleApplication1
{
-
public class Producer
{
private Buffer _buffer;
private Random _random;
- private Boolean _isAsleep;
- private static Boolean _wakeProducersUp;
+ private bool _isAsleep;
+ private static bool _wakeProducersUp;
public Producer(Buffer buffer)
diff --git a/Aufgabe3/ConsoleApplication1/Program.cs b/Aufgabe3/ConsoleApplication1/Program.cs
index 079df732dc4514828a29bd693f3e444ae5c40223..b634bea5d1b8b767ba770ab95a4cd01d8238959f 100644
--- a/Aufgabe3/ConsoleApplication1/Program.cs
+++ b/Aufgabe3/ConsoleApplication1/Program.cs
@@ -16,8 +16,8 @@ namespace ConsoleApplication1
public static void Main(string[] args)
{
- int nrProd = 0;
- int nrCons = 0;
+ int nrProd = 1;
+ int nrCons = 1;
//Parse received program arguments to int
try
diff --git a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe
index 1fe5394feeddf9a97268bbee4a3bac30e7dcb6e3..74e9ea035c7706abb4d03721df4b4243040686ee 100644
Binary files a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe and b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe differ
diff --git a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb
index dfb05576fd290f5d2e5f3dcc9cb7478d6744f54e..c0066aceb045d2de24c7278c5254a9ce08b668cd 100644
Binary files a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb and b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb differ
diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.AssemblyReference.cache b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.AssemblyReference.cache
index eb48dfe115ae819b39829865d0424213d303e6e2..7d684546224947a2a852f15ef4ee3cba37ff445f 100644
Binary files a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.AssemblyReference.cache and b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.AssemblyReference.cache differ
diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.CoreCompileInputs.cache b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.CoreCompileInputs.cache
index db2559cb43ed5f32a94c95bd7c8e41a901a49f65..bedebd1bb6a6b4576f2c053cad03cef35780070e 100644
--- a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.CoreCompileInputs.cache
+++ b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0b4c8a1d94f607e2a341f3264e9fea6d3251453f
+888050fa31f1c6fa41893fd170b9d2c4392c6215
diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.FileListAbsolute.txt b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.FileListAbsolute.txt
index 8ac6070d45f60bdd96a7fa82c7b1ab5684f533b7..bf5457e31241ba5462a7413037bc406f5fa72011 100644
--- a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.FileListAbsolute.txt
+++ b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.csproj.FileListAbsolute.txt
@@ -11,3 +11,13 @@ C:\Users\Niklas\RiderProjects\inf3_gitlab\Aufgabe3\ConsoleApplication1\obj\Debug
C:\Users\Niklas\RiderProjects\inf3_gitlab\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.csproj.CoreCompileInputs.cache
C:\Users\Niklas\RiderProjects\inf3_gitlab\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.exe
C:\Users\Niklas\RiderProjects\inf3_gitlab\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.pdb
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.csproj.AssemblyReference.cache
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.csproj.SuggestedBindingRedirects.cache
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.csproj.CoreCompileInputs.cache
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.exe
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.pdb
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\bin\Debug\ConsoleApplication1.exe
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\bin\Debug\ConsoleApplication1.pdb
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\bin\Debug\nunit.framework.dll
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\bin\Debug\nunit.framework.xml
+D:\_Studium MKI\Semester 3\Informatik 3\Aufgaben\inf3\Aufgabe3\ConsoleApplication1\obj\Debug\ConsoleApplication1.csproj.CopyComplete
diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe
index 1fe5394feeddf9a97268bbee4a3bac30e7dcb6e3..74e9ea035c7706abb4d03721df4b4243040686ee 100644
Binary files a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe and b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe differ
diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb
index dfb05576fd290f5d2e5f3dcc9cb7478d6744f54e..c0066aceb045d2de24c7278c5254a9ce08b668cd 100644
Binary files a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb and b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb differ