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

Мамедов Кенан 3821БПР3 #51

Open
wants to merge 6 commits into
base: main
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install gtest manually
run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && ls -l lib && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
run: sudo apt-get install libgtest-dev libgmock-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && ls -l lib && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
- uses: actions/checkout@v1
- name: configure
run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Werror" ..
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"C_Cpp.default.compilerPath": ""
}
40 changes: 20 additions & 20 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 MamedovKenan

#ifndef INCLUDE_TIMEDDOOR_H_
#define INCLUDE_TIMEDDOOR_H_
Expand All @@ -10,43 +10,43 @@ class TimedDoor;

class TimerClient {
public:
virtual void Timeout() = 0;
virtual void Timeout() = 0;
};

class Door {
public:
virtual void lock() = 0;
virtual void unlock() = 0;
virtual bool isDoorOpened() = 0;
virtual void lock() = 0;
virtual void unlock() = 0;
virtual bool isDoorOpened() = 0;
};

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

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

class Timer {
TimerClient *client;
void sleep(int);
TimerClient *client;
void sleep(int);
public:
void tregister(int, TimerClient*);
void tregister(int, TimerClient*);
};

#endif // INCLUDE_TIMEDDOOR_H_
52 changes: 52 additions & 0 deletions src/TimedDoor.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright 2024 MamedovKenan

#include <stdexcept>
#include <thread> // NOLINT [build/c++11]
#include <chrono> // NOLINT [build/c++11]
#include "TimedDoor.h"

DoorTimerAdapter::DoorTimerAdapter(TimedDoor& door_) : door(door_) {}

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

TimedDoor::TimedDoor(int timeout_) : iTimeout(timeout_), isOpened(false) {
adapter = new DoorTimerAdapter(*this);
}

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

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

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

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

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

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

void Timer::tregister(int time_, TimerClient* client_) {
this->client = client_;
sleep(time_);
client_->Timeout();
}
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 GHA Test Team
// Copyright 2024 MamedovKenan
#include "TimedDoor.h"
#include <iostream>

Expand Down
76 changes: 75 additions & 1 deletion test/tests.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,80 @@
// Copyright 2021 GHA Test Team
// Copyright 2024 MamedovKenan

#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_F(TimedDoorTest, Timeout) {
door.unlock();
std::this_thread::sleep_for(std::chrono::seconds(door.getTimeOut()));
EXPECT_THROW(door.throwState(), std::runtime_error);
}

TEST_F(TimedDoorTest, LockUnlock) {
std::this_thread::sleep_for(std::chrono::seconds(door.getTimeOut() + 1));
EXPECT_NO_THROW(door.throwState());
}

TEST_F(TimedDoorTest, LockBeforeTimeout) {
std::this_thread::sleep_for(std::chrono::seconds(door.getTimeOut() + 1));
door.unlock();
EXPECT_THROW(door.throwState(), std::runtime_error);
}

TEST_F(TimedDoorTest, UnlockMth) {
door.unlock();
EXPECT_TRUE(door.isDoorOpened());
}

TEST_F(TimedDoorTest, LockMth) {
door.unlock();
door.lock();
EXPECT_FALSE(door.isDoorOpened());
}

TEST_F(TimedDoorTest, ClosedDoor) {
EXPECT_FALSE(door.isDoorOpened());
}

TEST_F(TimedDoorTest, UnlockThrow) {
door.unlock();
EXPECT_THROW(door.unlock(), std::logic_error);
}

TEST_F(TimedDoorTest, ThrowState) {
door.unlock();
EXPECT_THROW(door.throwState(), std::runtime_error);
}

TEST_F(TimedDoorTest, CloseBefore) {
EXPECT_NO_THROW(door.throwState());
}

TEST_F(TimedDoorTest, LockDtw) {
EXPECT_THROW(door.lock(), std::logic_error);
}
Loading