Merge lp:~thomas-voss/location-service/make-trials-in-gps-test-configurable-and-output-test-summary into lp:location-service/trunk

[Thomas Voß]

Make the number of trials in {A}GPS tests configurable via an environment variable.
Add output of raw timing values to {A}GPS tests.

Make the number of trials in {A}GPS tests configurable via an environment variable.
Add output of raw timing values to {A}GPS tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/location-service-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/218
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/218

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/311/rebuild

review: Approve (continuous-integration)

Unmerged revisions

113. By Thomas Voß on 2014-10-07

Make the number of trials in {A}GPS tests configurable via an environment variable.
Add output of raw timing values to {A}GPS tests.

=== modified file 'tests/gps_provider_test.cpp'
--- tests/gps_provider_test.cpp	2014-07-15 15:04:22 +0000
+++ tests/gps_provider_test.cpp	2014-10-07 08:41:36 +0000
@@ -471,6 +471,8 @@
     static constexpr const char* supl_host{"supl_host"};
     // SUPL port
     static constexpr const char* supl_port{"supl_port"};
+    // The number of trials to execute for statistics calculation.
+    static constexpr const char* trial_count{"trial_count"};
 
     static location::ProgramOptions init_options()
     {
@@ -515,6 +517,10 @@
                     "SUPL port to use for positioning benchmarks.",
                     std::uint16_t{7476});
 
+        options.add(trial_count,
+                    "The number of trials to execute for statistics calculation.",
+                    std::uint32_t{3});
+
         return options;
     }
 
@@ -598,6 +604,10 @@
             options.value_for_key<double>(ref_accuracy) * location::units::Meters
         }
     };
+    std::uint32_t trials
+    {
+        options.value_for_key<std::uint32_t>(trial_count)
+    };
 };
 }
 
@@ -623,6 +633,7 @@
 // HardwareAbstractionLayerFixture.time_to_first_fix_cold_start_without_supl_benchmark_requires_hardware
 TEST_F(HardwareAbstractionLayerFixture, time_to_first_fix_cold_start_without_supl_benchmark_requires_hardware)
 {
+
     typedef boost::accumulators::accumulator_set<
         double,
         boost::accumulators::stats<
@@ -634,8 +645,7 @@
     using boost::accumulators::mean;
     using boost::accumulators::variance;
 
-    static const unsigned int trials = 3;
-
+    std::vector<std::chrono::microseconds> raw_values;
     Statistics stats;
     auto hal = gps::HardwareAbstractionLayer::create_default_instance();
 
@@ -701,8 +711,10 @@
             hal->stop_positioning();
         }
         auto stop = std::chrono::duration_cast<std::chrono::microseconds>(location::Clock::now().time_since_epoch());
+        auto duration = stop - start;
 
-        stats((stop - start).count());
+        raw_values.push_back(duration);
+        stats(duration.count());
     }
 
     std::cout << "Mean time to first fix in [ms]: "
@@ -715,6 +727,9 @@
                      std::chrono::microseconds(
                          static_cast<std::uint64_t>(variance(stats)))).count()
               << std::endl;
+    std::cout << "Time to first fix in [ms] per trial: " << std::endl;
+    for(const auto& ttff : raw_values)
+        std::cout << "\t" << ttff.count() << std::endl;
 }
 
 // HardwareAbstractionLayerFixture.time_to_first_fix_cold_start_with_supl_benchmark_requires_hardware
@@ -733,8 +748,7 @@
     using boost::accumulators::mean;
     using boost::accumulators::variance;
 
-    static const unsigned int trials = 3;
-
+    std::vector<std::chrono::microseconds> raw_values;
     Statistics stats;
     auto hal = gps::HardwareAbstractionLayer::create_default_instance();
 
@@ -823,8 +837,10 @@
 
         }
         auto stop = std::chrono::duration_cast<std::chrono::microseconds>(location::Clock::now().time_since_epoch());
+        auto duration = stop - start;
 
-        stats((stop - start).count());
+        raw_values.push_back(duration);
+        stats(duration.count());
     }
 
     std::cout << "Mean time to first fix in [ms]: "
@@ -837,5 +853,8 @@
                      std::chrono::microseconds(
                          static_cast<std::uint64_t>(variance(stats)))).count()
               << std::endl;
+    std::cout << "Time to first fix in [ms] per trial: " << std::endl;
+    for(const auto& ttff : raw_values)
+        std::cout << "\t" << ttff.count() << std::endl;
 }