Skip to content

Commit

Permalink
Rename CMake project to set
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirill Kornyakov committed Sep 16, 2015
1 parent 388bd47 commit d575332
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ before_script:
- mkdir ../build
- cd ../build
script:
- cmake ../mp2-lab1-bitfield
- cmake ../mp2-lab1-set
- make -j
- cd ./bin/
- ./test_bitfield --gtest_list_tests
- ./test_set --gtest_list_tests
notifications:
email: false
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8)

set(PROJECT_NAME bitfield)
set(PROJECT_NAME set)
project(${PROJECT_NAME})

# TODO(Kornyakov): not sure if these lines are needed
Expand Down
2 changes: 2 additions & 0 deletions src/tset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ int TSet::GetMaxPower(void) const // получить макс. к-во эл-т

int TSet::IsMember(const int Elem) const // элемент множества?
{
return 0;
}

void TSet::InsElem(const int Elem) // включение элемента множества
Expand All @@ -49,6 +50,7 @@ TSet& TSet::operator=(const TSet &s) // присваивание

int TSet::operator==(const TSet &s) const // сравнение
{
return 0;
}

int TSet::operator!=(const TSet &s) const // сравнение
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(target "${MP2_TESTS}")
set(target ${MP2_TESTS})

file(GLOB hdrs "*.h*")
file(GLOB srcs "*.cpp")
Expand Down
2 changes: 1 addition & 1 deletion test/test_tset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ TEST(TSet, can_insert_non_existing_element_using_plus_operator)
set.InsElem(2);
updatedSet = set + k;

EXPECT_EQ(0, set.IsMember(k));
EXPECT_NE(0, updatedSet.IsMember(k));
}

TEST(TSet, throws_when_insert_non_existing_element_out_of_range_using_plus_operator)
Expand Down

0 comments on commit d575332

Please sign in to comment.