[Boost-commit] svn:boost r74628 - in trunk/libs/chrono/test: . stopwatch

Subject: [Boost-commit] svn:boost r74628 - in trunk/libs/chrono/test: . stopwatch
From: vicente.botet_at_[hidden]
Date: 2011-10-01 16:48:48

Author: viboes
Date: 2011-10-01 16:48:46 EDT (Sat, 01 Oct 2011)
New Revision: 74628
URL: http://svn.boost.org/trac/boost/changeset/74628

Log:
Chrono: Rename lap_memory by las_collector
Added:
   trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_container_pass.cpp   (contents, props changed)
Text files modified: 
   trunk/libs/chrono/test/Jamfile.v2                                              |     1                                         
   trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_accumulator_set_pass.cpp |    44 ++++++++++++++++++++--------------------
   trunk/libs/chrono/test/stopwatch/basic_stopwatch_last_lap_pass.cpp             |    26 +++++++++++-----------                  
   3 files changed, 36 insertions(+), 35 deletions(-)

Modified: trunk/libs/chrono/test/Jamfile.v2
==============================================================================
--- trunk/libs/chrono/test/Jamfile.v2	(original)
+++ trunk/libs/chrono/test/Jamfile.v2	2011-10-01 16:48:46 EDT (Sat, 01 Oct 2011)
@@ -247,6 +247,7 @@
         [ chrono-run2 stopwatch/basic_stopwatch_pass.cpp  : basic_stopwatch_pass ]
         [ chrono-run2 stopwatch/basic_stopwatch_last_lap_pass.cpp  : basic_stopwatch_last_lap_pass ]
         [ chrono-run2 stopwatch/basic_stopwatch_laps_accumulator_set_pass.cpp  : basic_stopwatch_laps_accumulator_set_pass ]
+        [ chrono-run2 stopwatch/basic_stopwatch_laps_container_pass.cpp  : basic_stopwatch_laps_container_pass ]
         [ chrono-run2 stopwatch/suspendable_stopwatch_pass.cpp  : suspendable_stopwatch_pass ]
         ;
 

Modified: trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_accumulator_set_pass.cpp
==============================================================================
--- trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_accumulator_set_pass.cpp	(original)
+++ trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_accumulator_set_pass.cpp	2011-10-01 16:48:46 EDT (Sat, 01 Oct 2011)
@@ -37,8 +37,8 @@
 {
   Stopwatch sw;
   BOOST_TEST(sw.is_running());
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -49,8 +49,8 @@
   ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(d == Stopwatch::duration::zero());
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -60,8 +60,8 @@
   Stopwatch sw(ec);
   BOOST_TEST(sw.is_running());
   BOOST_TEST(ec.value()==0);
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -69,8 +69,8 @@
 {
   Stopwatch sw(boost::throws());
   BOOST_TEST(sw.is_running());
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -82,8 +82,8 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(100));
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -99,8 +99,8 @@
   BOOST_TEST(sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(100));
   BOOST_TEST(d < boost::chrono::milliseconds(200));
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -116,8 +116,8 @@
   BOOST_TEST(sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(100));
   BOOST_TEST(d < boost::chrono::milliseconds(200));
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==0);
 }
 
 template <typename Stopwatch>
@@ -133,8 +133,8 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==1);
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==1);
 }
 
 template <typename Stopwatch>
@@ -151,7 +151,7 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==1);
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==1);
 }
 
 template <typename Stopwatch>
@@ -165,8 +165,8 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==1);
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==1);
 }
 
 template <typename Stopwatch>
@@ -180,15 +180,15 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
   ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
   sw.stop();
   BOOST_TEST(!sw.is_running());
   d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
-  BOOST_TEST(boost::accumulators::count(sw.get_laps_memory().accumulator_set())==1);
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(boost::accumulators::count(sw.get_laps_collector().accumulator_set())==1);
 }
 
 

Added: trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_container_pass.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/chrono/test/stopwatch/basic_stopwatch_laps_container_pass.cpp	2011-10-01 16:48:46 EDT (Sat, 01 Oct 2011)
@@ -0,0 +1,220 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//  Adaptation to Boost of the libcxx
+//  Copyright 2010 Vicente J. Botet Escriba
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+#include <iostream>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/chrono/stopwatches/basic_stopwatch.hpp>
+#include <boost/chrono/stopwatches/memories/laps_sequence_container.hpp>
+#include <libs/chrono/test/cycle_count.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+#if !defined(BOOST_NO_STATIC_ASSERT)
+#define NOTHING ""
+#endif
+
+
+template <typename Stopwatch>
+void check_invariants()
+{
+    BOOST_CHRONO_STATIC_ASSERT((boost::is_same<typename Stopwatch::rep, typename Stopwatch::clock::duration::rep>::value), NOTHING, ());
+    BOOST_CHRONO_STATIC_ASSERT((boost::is_same<typename Stopwatch::period, typename Stopwatch::clock::duration::period>::value), NOTHING, ());
+    BOOST_CHRONO_STATIC_ASSERT((boost::is_same<typename Stopwatch::duration, typename Stopwatch::clock::time_point::duration>::value), NOTHING, ());
+    BOOST_CHRONO_STATIC_ASSERT(Stopwatch::is_steady == Stopwatch::clock::is_steady, NOTHING, ());
+}
+
+template <typename Stopwatch>
+void check_default_constructor()
+{
+  Stopwatch sw;
+  BOOST_TEST(sw.is_running());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_dont_start_constructor()
+{
+  Stopwatch sw(boost::chrono::dont_start);
+  BOOST_TEST(!sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(d == Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_constructor_ec()
+{
+  boost::system::error_code ec;
+  Stopwatch sw(ec);
+  BOOST_TEST(sw.is_running());
+  BOOST_TEST(ec.value()==0);
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_constructor_throws()
+{
+  Stopwatch sw(boost::throws());
+  BOOST_TEST(sw.is_running());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_elapsed()
+{
+  Stopwatch sw;
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(sw.is_running());
+  BOOST_TEST(d >= boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_start_start()
+{
+  Stopwatch sw;
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  sw.start();
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(sw.is_running());
+  BOOST_TEST(d >= boost::chrono::milliseconds(100));
+  BOOST_TEST(d < boost::chrono::milliseconds(200));
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_dont_start_start()
+{
+  Stopwatch sw(boost::chrono::dont_start);
+  BOOST_TEST(!sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  sw.start();
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(sw.is_running());
+  BOOST_TEST(d >= boost::chrono::milliseconds(100));
+  BOOST_TEST(d < boost::chrono::milliseconds(200));
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().container().size()==0);
+}
+
+template <typename Stopwatch>
+void check_dont_start_start_stop()
+{
+  Stopwatch sw(boost::chrono::dont_start);
+  BOOST_TEST(!sw.is_running());
+  sw.start();
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  sw.stop();
+  BOOST_TEST(!sw.is_running());
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(!sw.is_running());
+  BOOST_TEST(d == boost::chrono::milliseconds(0));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().container().size()==1);
+}
+
+template <typename Stopwatch>
+void check_dont_start_scoped_run()
+{
+  Stopwatch sw(boost::chrono::dont_start);
+  BOOST_TEST(!sw.is_running());
+  {
+    typename Stopwatch::scoped_run _(sw);
+    BOOST_TEST(sw.is_running());
+    ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  }
+  BOOST_TEST(!sw.is_running());
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(!sw.is_running());
+  BOOST_TEST(d == boost::chrono::milliseconds(0));
+  BOOST_TEST(sw.get_laps_collector().container().size()==1);
+}
+
+template <typename Stopwatch>
+void check_stop()
+{
+  Stopwatch sw;
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  sw.stop();
+  BOOST_TEST(!sw.is_running());
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(!sw.is_running());
+  BOOST_TEST(d == boost::chrono::milliseconds(0));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().container().size()==1);
+}
+
+template <typename Stopwatch>
+void check_stop_stop()
+{
+  Stopwatch sw;
+  BOOST_TEST(sw.is_running());
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  sw.stop();
+  BOOST_TEST(!sw.is_running());
+  typename Stopwatch::duration d=sw.elapsed();
+  BOOST_TEST(!sw.is_running());
+  BOOST_TEST(d == boost::chrono::milliseconds(0));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
+  sw.stop();
+  BOOST_TEST(!sw.is_running());
+  d=sw.elapsed();
+  BOOST_TEST(!sw.is_running());
+  BOOST_TEST(d == boost::chrono::milliseconds(0));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().container().size()==1);
+}
+
+
+template <typename Stopwatch>
+void check_all()
+{
+  check_invariants<Stopwatch>();
+  check_default_constructor<Stopwatch>();
+  check_constructor_ec<Stopwatch>();
+  check_constructor_throws<Stopwatch>();
+  check_elapsed<Stopwatch>();
+
+  check_start_start<Stopwatch>();
+  check_dont_start_constructor<Stopwatch>();
+  check_dont_start_start<Stopwatch>();
+  check_dont_start_start_stop<Stopwatch>();
+  check_dont_start_scoped_run<Stopwatch>();
+  check_stop<Stopwatch>();
+  check_stop_stop<Stopwatch>();
+
+}
+
+
+int main()
+{
+  std::cout << "cycle_count=";
+  check_all<boost::chrono::basic_stopwatch< ex::cycle_count<1500>, boost::chrono::laps_sequence_container<ex::cycle_count<1500>::duration> > >();
+  return boost::report_errors();
+}

Modified: trunk/libs/chrono/test/stopwatch/basic_stopwatch_last_lap_pass.cpp
==============================================================================
--- trunk/libs/chrono/test/stopwatch/basic_stopwatch_last_lap_pass.cpp	(original)
+++ trunk/libs/chrono/test/stopwatch/basic_stopwatch_last_lap_pass.cpp	2011-10-01 16:48:46 EDT (Sat, 01 Oct 2011)
@@ -37,7 +37,7 @@
 {
   Stopwatch sw;
   BOOST_TEST(sw.is_running());
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -48,7 +48,7 @@
   ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(d == Stopwatch::duration::zero());
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -58,7 +58,7 @@
   Stopwatch sw(ec);
   BOOST_TEST(sw.is_running());
   BOOST_TEST(ec.value()==0);
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -66,7 +66,7 @@
 {
   Stopwatch sw(boost::throws());
   BOOST_TEST(sw.is_running());
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -78,7 +78,7 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(100));
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -94,7 +94,7 @@
   BOOST_TEST(sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(100));
   BOOST_TEST(d < boost::chrono::milliseconds(200));
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -110,7 +110,7 @@
   BOOST_TEST(sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(100));
   BOOST_TEST(d < boost::chrono::milliseconds(200));
-  BOOST_TEST(sw.get_laps_memory().last()==Stopwatch::duration::zero());
+  BOOST_TEST(sw.get_laps_collector().last()==Stopwatch::duration::zero());
 }
 
 template <typename Stopwatch>
@@ -126,7 +126,7 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
 }
 
 template <typename Stopwatch>
@@ -143,7 +143,7 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
 
   BOOST_TEST(!sw.is_running());
   {
@@ -155,7 +155,7 @@
   d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d >= boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(200));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(200));
 }
 
 template <typename Stopwatch>
@@ -169,7 +169,7 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
 }
 
 template <typename Stopwatch>
@@ -183,14 +183,14 @@
   typename Stopwatch::duration d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
   ex::sleep_for<typename Stopwatch::clock>(boost::chrono::milliseconds(100));
   sw.stop();
   BOOST_TEST(!sw.is_running());
   d=sw.elapsed();
   BOOST_TEST(!sw.is_running());
   BOOST_TEST(d == boost::chrono::milliseconds(0));
-  BOOST_TEST(sw.get_laps_memory().last()==boost::chrono::milliseconds(100));
+  BOOST_TEST(sw.get_laps_collector().last()==boost::chrono::milliseconds(100));
 }