From 4ff6f2fbea2c76128debae5f0f197ba628b5760d Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Wed, 5 May 2021 17:22:51 +0200 Subject: [PATCH] coverage --- corsika/stack/NuclearStackExtension.hpp | 4 ++-- corsika/stack/VectorStack.hpp | 6 ++++-- tests/framework/testSecondaryView.cpp | 2 ++ tests/framework/testStackInterface.cpp | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/corsika/stack/NuclearStackExtension.hpp b/corsika/stack/NuclearStackExtension.hpp index 1139d440b..0f14c68e9 100644 --- a/corsika/stack/NuclearStackExtension.hpp +++ b/corsika/stack/NuclearStackExtension.hpp @@ -146,12 +146,12 @@ namespace corsika::nuclear_stack { * Overwrite normal setMomentum function with nuclear version */ void setMomentum(MomentumVector const& v); - + /** * Overwrite normal getMomentum function with nuclear version */ MomentumVector getMomentum() const; - + /** * Overwrite normal getEnergy function with nuclear version */ diff --git a/corsika/stack/VectorStack.hpp b/corsika/stack/VectorStack.hpp index 0c20a2361..47b503c8f 100644 --- a/corsika/stack/VectorStack.hpp +++ b/corsika/stack/VectorStack.hpp @@ -87,7 +87,8 @@ namespace corsika { ///! Set energy void setEnergy(HEPEnergyType const& e) { - super_type::getStackData().setKineticEnergy(super_type::getIndex(), e - this->getMass()); + super_type::getStackData().setKineticEnergy(super_type::getIndex(), + e - this->getMass()); } ///! Set kinetic energy @@ -107,7 +108,8 @@ namespace corsika { super_type::getIndex(), DirectionVector(v.getCoordinateSystem(), {0, 0, 0})); } else { super_type::getStackData().setKineticEnergy( - super_type::getIndex(), sqrt(square(getMass()) + square(P)) - this->getMass()); + super_type::getIndex(), + sqrt(square(getMass()) + square(P)) - this->getMass()); super_type::getStackData().setDirection(super_type::getIndex(), v / P); } } diff --git a/tests/framework/testSecondaryView.cpp b/tests/framework/testSecondaryView.cpp index fa113f88b..9ca07a13d 100644 --- a/tests/framework/testSecondaryView.cpp +++ b/tests/framework/testSecondaryView.cpp @@ -76,6 +76,7 @@ TEST_CASE("SecondaryStack", "[stack]") { CHECK(view.getSize() == 0); CHECK(view.getEntries() == 0); CHECK(view.isEmpty()); + CHECK_THROWS(view.erase(view.begin())); // nothing to delete yet { auto proj = view.getProjectile(); @@ -112,6 +113,7 @@ TEST_CASE("SecondaryStack", "[stack]") { auto pDel = view.getNextParticle(); view.erase(pDel); + CHECK_THROWS(view.erase(pDel)); // already erased CHECK(view.getSize() == 2); CHECK(stack.getSize() == 4); diff --git a/tests/framework/testStackInterface.cpp b/tests/framework/testStackInterface.cpp index 4171647af..a8d82894a 100644 --- a/tests/framework/testStackInterface.cpp +++ b/tests/framework/testStackInterface.cpp @@ -71,6 +71,9 @@ TEST_CASE("Stack", "[Stack]") { SECTION("delete from stack") { StackTest stack; + + CHECK_THROWS(stack.erase(stack.begin())); // nothing to delete + CHECK(stack.getSize() == 0); StackTest::stack_iterator_type p = stack.addParticle(std::tuple{0.}); // valid way to access particle data @@ -80,6 +83,7 @@ TEST_CASE("Stack", "[Stack]") { stack.erase(p); CHECK(stack.getSize() == 1); CHECK(stack.getEntries() == 0); + CHECK_THROWS(stack.erase(p)); // already deleted } SECTION("delete particle") { -- GitLab