From a4550a9bb9b073ff1b512e86289c55bc77c995f7 Mon Sep 17 00:00:00 2001 From: hugogogo Date: Sat, 4 Jun 2022 10:57:57 +0200 Subject: [PATCH] save before closing pc --- headers/tests.hpp | 3 +++ templates/vector.tpp | 2 ++ tests/main.cpp | 62 ++++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/headers/tests.hpp b/headers/tests.hpp index c4cd145..a5d2675 100644 --- a/headers/tests.hpp +++ b/headers/tests.hpp @@ -1,6 +1,7 @@ #ifndef TESTS_H # define TESTS_H +#include "colors.h" #include #include @@ -17,6 +18,8 @@ test_list.push_back(test);\ } +# define TITLE(s) std::cout << "\n" B_PURPLE #s RESET "\n\n"; + struct test_base { std::string title; virtual void func() {} diff --git a/templates/vector.tpp b/templates/vector.tpp index 6314167..8552b31 100644 --- a/templates/vector.tpp +++ b/templates/vector.tpp @@ -174,6 +174,7 @@ VT_TPL typename VT::reference VT:: VT_TPL template void VT:: assign( InputIterator first, InputIterator last) { +std::cout << "inside assign(first, last)"; InputIterator tmp = first; int range; @@ -193,6 +194,7 @@ VT_TPL template void VT:: VT_TPL void VT:: assign( size_type n, const T & val ) { +std::cout << "inside assign(n, val)"; if (n > _allocator.max_size()) throw std::length_error("assign: n > max_size"); diff --git a/tests/main.cpp b/tests/main.cpp index 8f0f5b0..c4cd456 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -13,36 +13,6 @@ int main() { - TEST(test assign capacity) - { - ft::vector myvector; - int size; - - std::cout << "capacity before assignation : " << myvector.capacity() << "\n"; - - std::cout << "\nassign 1\n"; - myvector.assign(1, 12); - size = myvector.size(); - for (int i = 0; i < size; i++) - std::cout << "[" << std::setw(2) << i << "] " << myvector[i] << " - "; - std::cout << "\nsize : " << size << " , capacity : " << myvector.capacity() << "\n"; - - std::cout << "\nassign 3\n"; - myvector.assign(3, 12); - size = myvector.size(); - for (int i = 0; i < size; i++) - std::cout << "[" << std::setw(2) << i << "] " << myvector[i] << " - "; - std::cout << "\nsize : " << size << " , capacity : " << myvector.capacity() << "\n"; - - // std::cout << "\nassign 7268\n"; - // myvector.assign(7268, 12); - // size = myvector.size(); - // for (int i = 0; i < size; i++) - // std::cout << "[" << std::setw(2) << i << "] " << myvector[i] << " - "; - // std::cout << "\nsize : " << size << " , capacity : " << myvector.capacity() << "\n"; - } - TESTEND - /* TEST(vector::vector (constructor)) { @@ -309,9 +279,12 @@ int main() { std::cout << "myvector.front() is now " << myvector.front() << '\n'; } TESTEND +*/ TEST(vector::assign) { + TITLE(cplusplus.com reference :) + std::vector first; std::vector second; std::vector third; @@ -329,9 +302,36 @@ int main() { std::cout << "Size of first: " << int (first.size()) << '\n'; std::cout << "Size of second: " << int (second.size()) << '\n'; std::cout << "Size of third: " << int (third.size()) << '\n'; + + TITLE(capacity tests of assignation :) + + ft::vector myvector; + int size; + + std::cout << "capacity before assignation : " << myvector.capacity() << "\n"; + + std::cout << "\nassign 1\n"; + myvector.assign(1, 12); + size = myvector.size(); + for (int i = 0; i < size; i++) + std::cout << "[" << i << "] " << myvector[i] << " - "; + std::cout << "\nsize : " << size << " , capacity : " << myvector.capacity() << "\n"; + + std::cout << "\nassign 3\n"; + myvector.assign(3, 12); + size = myvector.size(); + for (int i = 0; i < size; i++) + std::cout << "[" << i << "] " << myvector[i] << " - "; + std::cout << "\nsize : " << size << " , capacity : " << myvector.capacity() << "\n"; + + // std::cout << "\nassign 7268\n"; + // myvector.assign(7268, 12); + // size = myvector.size(); + // for (int i = 0; i < size; i++) + // std::cout << "[" << i << "] " << myvector[i] << " - "; + // std::cout << "\nsize : " << size << " , capacity : " << myvector.capacity() << "\n"; } TESTEND -*/ TEST(vector::push_back) {