Backup

Uppgift-1-Klockslag/tdiu20-given-files-master/Time.cc

@@ -2,25 +2,14 @@
 // som deklarerats i Time.h
 
 #include "Time.h"
+Time::Time(string text) : hour{0}, minute{0}, second{0} { }
+Time::Time(int h, int m, int s) : hour{h}, minute{m}, second{s} {
 
-Time::Time(int h, int m, int s) : hour{h}, minute{m}, second{s} { }
-
-Time::Time(int text) : hour{0}, minute{0}, second{0} { }
-
-/*
 if(check_invalid_time(h, m, s)){
-
-
-throw invalid_argument{"ogiltigt_value"};
+  throw invalid_argument{"ogiltigt_value"};
 }
 }
-bool Time::check_default_time(int const h, int const m, int const s){  // konstruktor som gör så att andra tal som inte är default value godkänns 
-  if (h != 0 or m != 0 or s != 0) {
-
 
-}
-}
-*/
 
 int Time::get_second() { //Gets current hour.
   return second;
@@ -34,7 +23,7 @@ int Time::get_hour() { //Gets current hour.
   return hour;
 }
 
-/*
+
 bool Time::check_invalid_time(int const h, int const m, int const s){
  if(h > 23 || h < 0 || m > 59 || m < 0 || s > 59 || s < 0)
 {
@@ -47,7 +36,7 @@ return false;
 
 }
 
-
+/*
 bool Time::is_am() {
   if (hour < 12) {
     return true;

Uppgift-1-Klockslag/tdiu20-given-files-master/Time.h

@@ -20,7 +20,7 @@ class Time
 public:
   Time(int h , int m, int s);
   Time() : hour{0}, minute{0}, second{0} {};
-  Time(int text);
+  Time(string text);
 
   int get_hour();
   int get_minute();

Uppgift-1-Klockslag/tdiu20-given-files-master/logg.txt

+23 Feb
+- Fixa operator++ så att tiden ökar på

Uppgift-1-Klockslag/tdiu20-given-files-master/time_test.cc

@@ -37,11 +37,8 @@ TEST_CASE ("Constructors and getters")
       CHECK( empty.get_hour()   == 0 );
       CHECK( empty.get_minute() == 0 );
       CHECK( empty.get_second() == 0 );
-      //empty.get_hour() += 1000;
    }
 
-/* ----- REMOVE THIS COMMENT WHEN PREVIOUS TEST PASSES -----
-
    SECTION("Integer")
    {
       Time t0{0,0,0};
@@ -62,8 +59,6 @@ TEST_CASE ("Constructors and getters")
       CHECK( t2.get_minute() == 59 );
       CHECK( t2.get_second() == 59 );
    }
-*/
-/* ----- REMOVE THIS COMMENT WHEN PREVIOUS TEST PASSES -----
 
    SECTION("String")
    {
@@ -85,7 +80,7 @@ TEST_CASE ("Constructors and getters")
       CHECK( t2.get_minute() == 59 );
       CHECK( t2.get_second() == 59 );  
    }
-*/
+
 }
 /* ----- REMOVE THIS COMMENT WHEN PREVIOUS TEST PASSES -----
 TEST_CASE ("is_am")