Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Саратова Марина. Задание №3. #13

Open
wants to merge 13 commits into
base: b16
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "googletest"]
path = googletest
url = https://github.com/google/googletest.git
9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,14 @@ set(tool_dest "bin")
set(lib_dest "lib")
set(include_dest "include/")

include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.10.0
)
FetchContent_MakeAvailable(googletest)


add_subdirectory(src)
add_subdirectory(test)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ class TimedDoor : public Door {
private:
DoorTimerAdapter * adapter;
int iTimeout;
bool opened;
bool isOpened;
public:
explicit TimedDoor(int);
bool isDoorOpened();
void unlock();
void lock();
void DoorTimeOut();
int getTimeOut();
void throwState();
};

Expand Down
16 changes: 8 additions & 8 deletions include/TimedDoor.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 GHA Test Team
// Copyright 2024 Saratova Marina

#ifndef INCLUDE_TIMEDDOOR_H_
#define INCLUDE_TIMEDDOOR_H_
Expand All @@ -22,28 +22,28 @@ class Door {

class DoorTimerAdapter : public TimerClient {
private:
TimedDoor& door;
TimedDoor& timedDoorRef;
public:
explicit DoorTimerAdapter(TimedDoor&);
explicit DoorTimerAdapter(TimedDoor &);
void Timeout();
};

class TimedDoor : public Door {
private:
DoorTimerAdapter * adapter;
int iTimeout;
bool opened;
DoorTimerAdapter * timerAdapterPtr;
int timeoutValue;
bool isOpened;
public:
explicit TimedDoor(int);
bool isDoorOpened();
void unlock();
void lock();
void DoorTimeOut();
int getTimeOut() const;
void throwState();
};

class Timer {
TimerClient *client;
TimerClient *clientPtr;
void sleep(int);
public:
void tregister(int, TimerClient*);
Expand Down
55 changes: 55 additions & 0 deletions src/TimedDoor.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Copyright 2024 Saratova Marina

#include <stdexcept>
#include <thread> // NOLINT [build/c++11]
#include <chrono> // NOLINT [build/c++11]

#include "TimedDoor.h"

DoorTimerAdapter::DoorTimerAdapter(TimedDoor & timedDoorRef_) : timedDoorRef
(timedDoorRef_) {}

void DoorTimerAdapter::Timeout() {
if (timedDoorRef.isDoorOpened())
throw std::runtime_error("Time's up!");
return;
}

TimedDoor::TimedDoor(int timeoutValue_) : timeoutValue(timeoutValue_),
isOpened(false) {
timerAdapterPtr = new DoorTimerAdapter(*this);
}

bool TimedDoor::isDoorOpened() {
return isOpened;
}

void TimedDoor::unlock() {
if (isOpened)
throw std::logic_error("Door is open!!!");
isOpened = true;
}

void TimedDoor::lock() {
if (!isOpened)
throw std::logic_error("Door is close!!!");
isOpened = false;
}

int TimedDoor::getTimeOut() const {
return timeoutValue;
}

void TimedDoor::throwState() {
timerAdapterPtr->Timeout();
}

void Timer::sleep(int time_) {
std::this_thread::sleep_for(std::chrono::seconds(time_));
}

void Timer::tregister(int time_, TimerClient* client_) {
this->clientPtr = client_;
sleep(time_);
client_->Timeout();
}
99 changes: 98 additions & 1 deletion test/tests.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,103 @@
// Copyright 2021 GHA Test Team
// Copyright 2024 Saratova Marina

#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include <cstdint>
#include <chrono> // NOLINT [build/c++11]
#include <thread> // NOLINT [build/c++11]

#include "TimedDoor.h"

class MockTimerClient : public TimerClient {
public:
MOCK_METHOD(void, Timeout, (), (override));
};

class TimedDoorTest : public ::testing::Test {
protected:
TimedDoor door;
MockTimerClient mockClient;
Timer timer;

TimedDoorTest() : door(1), timer() {}

void SetUp() override {
timer.tregister(door.getTimeOut(), &mockClient);
}

void TearDown() override {
testing::Mock::VerifyAndClearExpectations(&mockClient);
}
};

TEST(TimedDoorTest, DefaultDoorState) {
TimedDoor door(10);
EXPECT_FALSE(door.isDoorOpened());
EXPECT_EQ(door.getTimeOut(), 10);
}

TEST(TimedDoorTest, UnlockLockDoor) {
TimedDoor door(10);
door.unlock();
EXPECT_TRUE(door.isDoorOpened());
door.lock();
EXPECT_FALSE(door.isDoorOpened());
}

TEST(TimedDoorTest, DoorRemainsOpenAfterTimeout) {
TimedDoor door(2);
door.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
EXPECT_TRUE(door.isDoorOpened());
}

TEST(TimedDoorTest, DoorClosesAutomaticallyAfterTimeout) {
TimedDoor door(2);
door.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
EXPECT_TRUE(door.isDoorOpened());
}

TEST(TimedDoorTest, UnlockWhileDoorAlreadyOpen) {
TimedDoor door(10);
door.unlock();
EXPECT_THROW(door.unlock(), std::logic_error);
}

TEST(TimedDoorTest, LockWhileDoorAlreadyClosed) {
TimedDoor door(10);
EXPECT_THROW(door.lock(), std::logic_error);
}

TEST(TimedDoorTest, ThrowStateAfterTimeout) {
TimedDoor door(2);
door.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
EXPECT_THROW(door.throwState(), std::runtime_error);
}

TEST(TimedDoorTest, DoorRemainsClosedIfNotUnlocked) {
TimedDoor door(5);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
EXPECT_FALSE(door.isDoorOpened());
}

TEST(TimedDoorTest, DoorRemainsOpenedAfterUnlock) {
TimedDoor door(10);
door.unlock();
EXPECT_TRUE(door.isDoorOpened());
}

TEST(TimedDoorTest, ThrowStateWhenTimeoutReachedWhileOpen) {
TimedDoor door(2);
door.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
EXPECT_THROW(door.throwState(), std::runtime_error);
}

TEST(TimedDoorTest, NoThrowStateWhenTimeoutNotReachedWhileOpen) {
TimedDoor door(5);
door.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
EXPECT_ANY_THROW(door.throwState());
}
Loading