v3

feladat4/UnitTest1/UnitTest1.cpp

@@ -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 <iostream>
@@ -97,6 +97,7 @@ namespace UnitTest1
 				{ 1972, 1, 1 },
 				{ 1970, 1, 2 },
 				{ 1970, 1, 1 },
+				{ 1970, 1, 1 },
 			};
 			int dates2[][3] = { //expected
 				{ 1970, 1, 2 },
@@ -107,6 +108,7 @@ namespace UnitTest1
 				{ 1972, 12, 31 },
 				{ 1970, 1, 1 },
 				{ 1970, 1, 1 },
+				{ 1970, 1, 1 },
 			};
 			int counts[] = {
 				1,
@@ -116,7 +118,8 @@ namespace UnitTest1
 				365,
 				365,
 				-1, //technically allowed
-				- 1 //since SubDays calls AddDays, this counts as its test
+				- 1, //since SubDays calls AddDays, this counts as its test
+				-100,
 			};
 			int testcount = sizeof(dates1) / 12;
 			for (size_t i = 0; i < testcount; i++)
@@ -132,7 +135,7 @@ namespace UnitTest1
 				}
 				catch (const CMyDateException& e)
 				{
-					Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last case
+					Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last two cases
 				}
 				catch (...) {
 					Assert::IsTrue(false);

feladat4/feladat4/UnitTest1.cpp

@@ -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 <iostream>
@@ -97,6 +97,7 @@ namespace UnitTest1
 				{ 1972, 1, 1 },
 				{ 1970, 1, 2 },
 				{ 1970, 1, 1 },
+				{ 1970, 1, 1 },
 			};
 			int dates2[][3] = { //expected
 				{ 1970, 1, 2 },
@@ -107,6 +108,7 @@ namespace UnitTest1
 				{ 1972, 12, 31 },
 				{ 1970, 1, 1 },
 				{ 1970, 1, 1 },
+				{ 1970, 1, 1 },
 			};
 			int counts[] = {
 				1,
@@ -116,7 +118,8 @@ namespace UnitTest1
 				365,
 				365,
 				-1, //technically allowed
-				- 1 //since SubDays calls AddDays, this counts as its test
+				- 1, //since SubDays calls AddDays, this counts as its test
+				-100,
 			};
 			int testcount = sizeof(dates1) / 12;
 			for (size_t i = 0; i < testcount; i++)
@@ -132,7 +135,7 @@ namespace UnitTest1
 				}
 				catch (const CMyDateException& e)
 				{
-					Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last case
+					Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last two cases
 				}
 				catch (...) {
 					Assert::IsTrue(false);

feladat4/feladat4/cmydate.cpp

@@ -1,4 +1,4 @@
-//Tóth Dániel Mátyás | IFPQYY | V2
+//Tóth Dániel Mátyás | IFPQYY | V3
 #include <iostream>
 #include "cmydateexception.h"
 #include "cmydate.h"
@@ -35,7 +35,9 @@ CMyDate::CMyDate() {
 	m_iDay = 1;
 }
 CMyDate::CMyDate(int year, int month, int day) {
-	IsValid(year, month, day);
+	IsValidYear(year);
+	IsValidMonth(month);
+	IsValidDay(year, month, day);
 	m_iYear = year;
 	m_iMonth = month;
 	m_iDay = day;
@@ -70,12 +72,12 @@ void CMyDate::AddDays(int days) {
 	int timestamp = DateToTimeStamp(GetYear(), GetMonth(), GetDay());
 	int y = 0, m = 0, d = 0;
 	TimeStampToDate(timestamp + days, &y, &m, &d);
-	if (IsValid(y, m, d))
+	IsValidYear(y);
-	{
+	IsValidMonth(m);
-		m_iYear = y;
+	IsValidDay(y, m, d);
-		m_iMonth = m;
+	m_iYear = y;
-		m_iDay = d;
+	m_iMonth = m;
-	}
+	m_iDay = d;
 }
 void CMyDate::SubDays(int days) {
 	AddDays(days * (-1));

feladat4/feladat4/cmydate.h

@@ -1,4 +1,4 @@
-//Tóth Dániel Mátyás | IFPQYY | V2
+//Tóth Dániel Mátyás | IFPQYY | V3
 #pragma once
 class CMyDate {
 public:

feladat4/feladat4/cmydateexception.cpp

@@ -1,31 +1,12 @@
-//Tóth Dániel Mátyás | IFPQYY | V2
+//Tóth Dániel Mátyás | IFPQYY | V3
 #include "cmydateexception.h"
 
-static int CopyStr(char* dest, const char* src, const char* concat = "\0") {
-	if (dest == nullptr || src == nullptr) {
-		return -1;
-	}
-	int i = 0;
-	while (src[i] != '\0')
-	{
-		dest[i++] = src[i];
-	}
-	int j = 0;
-	while (concat[j] != '\0')
-	{
-		dest[i++] = concat[j++];
-	}
-	dest[i] = '\0';
-	return -1;
-}
-
 CMyDateException::CMyDateException(const char* s)
 {
-	msg = new char[256];
+	msg = std::string(s);
-	CopyStr(msg, s);
 }
 
 const char* CMyDateException::what() const {
-	return msg;
+	return msg.c_str();
 }
 

feladat4/feladat4/cmydateexception.h

@@ -1,5 +1,6 @@
-//Tóth Dániel Mátyás | IFPQYY | V2
+//Tóth Dániel Mátyás | IFPQYY | V3
 #pragma once
+#include <string>
 class CMyDateException {
 public:
 	CMyDateException(const char* s);
@@ -11,5 +12,5 @@ public:
 	static constexpr const char* ErrMinYear = "Hiba: ev kisebb, mint 1970!";
 	static constexpr const char* ErrUnexpected = "Varatlan hiba";
 private:
-	char* msg;
+	std::string msg;
 };

feladat4/feladat4/feladat4.cpp

@@ -1,2 +0,0 @@
-//Tóth Dániel Mátyás | IFPQYY | V1
-#include "feladat4.h"

feladat4/feladat4/feladat4.h

@@ -1,2 +0,0 @@
-//Tóth Dániel Mátyás | IFPQYY | V1
-#pragma once

feladat4/feladat4/main.cpp

@@ -1,4 +1,4 @@
-//Tóth Dániel Mátyás | IFPQYY | V2
+//Tóth Dániel Mátyás | IFPQYY | V3
 #include <exception>
 #include <iostream>
 #include "cmydateexception.h"