From d2f2b183a4897231034c99e7ebce11e145d944bb Mon Sep 17 00:00:00 2001
From: Janik Zikovsky <zikovskyjl@ornl.gov>
Date: Thu, 17 Mar 2011 17:17:49 +0000
Subject: [PATCH] Refs #2666: A couple of extra tests.
---
Code/Mantid/Framework/API/src/Progress.cpp | 1 +
Code/Mantid/Framework/API/test/ProgressTextTest.h | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/Code/Mantid/Framework/API/src/Progress.cpp b/Code/Mantid/Framework/API/src/Progress.cpp
index 6ce87bc61fe..541a967f94c 100644
--- a/Code/Mantid/Framework/API/src/Progress.cpp
+++ b/Code/Mantid/Framework/API/src/Progress.cpp
@@ -83,6 +83,7 @@ void Progress::reportIncrement(int inc, const std::string& msg)
void Progress::setNumSteps(int nsteps)
{
m_numSteps = nsteps;
+ if (m_numSteps <= 0) m_numSteps = 1; // Minimum of 1
m_step = (m_end-m_start) / (m_numSteps);
int notifyStep = 1;
m_notifyStep = (static_cast<int>(double(m_numSteps)*notifyStep/100/(m_end-m_start)));
diff --git a/Code/Mantid/Framework/API/test/ProgressTextTest.h b/Code/Mantid/Framework/API/test/ProgressTextTest.h
index a17bd6f9b25..e42392d45e3 100644
--- a/Code/Mantid/Framework/API/test/ProgressTextTest.h
+++ b/Code/Mantid/Framework/API/test/ProgressTextTest.h
@@ -8,6 +8,7 @@
#include <iomanip>
#include <cstdlib>
+#include "MantidAPI/Progress.h"
#include "MantidAPI/ProgressText.h"
using namespace Mantid::API;
@@ -22,6 +23,16 @@ public:
TS_ASSERT_THROWS_NOTHING(p.setNumSteps(100));
}
+ void test_constructors()
+ {
+ // No steps?
+ TS_ASSERT_THROWS_NOTHING(Progress p(NULL, 0.0, 1.0, 0); p.report(); );
+ TS_ASSERT_THROWS_NOTHING(ProgressText p(0.0, 1.0, 0); );
+ // Max is < min
+ TS_ASSERT_THROWS_NOTHING(Progress p(NULL, 1.0, 0.5, 10); p.report(); );
+ TS_ASSERT_THROWS_NOTHING(ProgressText p(NULL, 1.0, 0.5, 10); );
+ }
+
/// Disabled because it has text output
void xtest_with_stdout()
--
GitLab