From 5284be25ae13b7ed1c6850038d2e32c991436009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Sat, 4 Jan 2020 12:38:43 +0100
Subject: [PATCH] style fixes

---
 CppUnit/include/CppUnit/TestCase.h | 17 ++++++++++-------
 CppUnit/src/TestRunner.cpp         |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CppUnit/include/CppUnit/TestCase.h b/CppUnit/include/CppUnit/TestCase.h
index 6b7930392..109d1ecaa 100644
--- a/CppUnit/include/CppUnit/TestCase.h
+++ b/CppUnit/include/CppUnit/TestCase.h
@@ -135,7 +135,7 @@ protected:
                       long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
                       const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
 
-	void assertEquals(const std::string& expected, 
+	void assertEquals(const std::string& expected,
 	                  const std::string& actual,
 	                  long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
 	                  const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
@@ -155,7 +155,7 @@ protected:
 	                   long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
 	                   const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
 
-	void assertNull(const void* pointer,  
+	void assertNull(const void* pointer,
 	                const std::string& pointerExpression = "",
 	                long lineNumber = CppUnitException::CPPUNIT_UNKNOWNLINENUMBER,
 	                const std::string& fileName = CppUnitException::CPPUNIT_UNKNOWNFILENAME);
@@ -192,14 +192,14 @@ inline TestCase::~TestCase()
 // Returns a count of all the tests executed
 inline int TestCase::countTestCases() const
 {
-	return 1; 
+	return 1;
 }
 
 
 // Returns the name of the test case
 inline const std::string& TestCase::name() const
 {
-	return _name; 
+	return _name;
 }
 
 
@@ -224,22 +224,25 @@ inline void TestCase::tearDown()
 // Returns the name of the test case instance
 inline std::string TestCase::toString() const
 {
-	const std::type_info& thisClass = typeid(*this); 
-	return std::string(thisClass.name()) + "." + name(); 
+	const std::type_info& thisClass = typeid(*this);
+	return std::string(thisClass.name()) + "." + name();
 }
 
+
 // Returns the type of the test, see Test::Type
 inline Test::Type TestCase::getType() const
 {
 	return _type;
 }
 
+
 // Set the type of the test, see Test::Type
 inline void TestCase::setType(Test::Type testType)
 {
 	_type = testType;
 }
 
+
 // A set of macros which allow us to get the line number
 // and file name at the point of an error.
 // Just goes to show that preprocessors do have some
@@ -271,7 +274,7 @@ inline void TestCase::setType(Test::Type testType)
 
 #define assertNullPtr(ptr) \
 	(this->assertNull((ptr), #ptr, __LINE__, __FILE__))
-	
+
 #define assertNotNullPtr(ptr) \
 	(this->assertNotNull((ptr), #ptr, __LINE__, __FILE__))
 
diff --git a/CppUnit/src/TestRunner.cpp b/CppUnit/src/TestRunner.cpp
index 3efbe77f9..c6814da4e 100644
--- a/CppUnit/src/TestRunner.cpp
+++ b/CppUnit/src/TestRunner.cpp
@@ -49,7 +49,7 @@ bool TestRunner::run(const std::vector<std::string>& args)
 	bool all     = false;
 	bool wait    = false;
 	bool printed = false;
-	bool long_running = false;
+	bool longRunning = false;
 	std::string ignore;
 
 	std::vector<std::string>	setup;
@@ -70,7 +70,7 @@ bool TestRunner::run(const std::vector<std::string>& args)
 		}
 		else if (arg == "-long")
 		{
-			long_running = true;
+			longRunning = true;
 			continue;
 		}
 		else if (arg == "-ignore")
@@ -134,7 +134,7 @@ bool TestRunner::run(const std::vector<std::string>& args)
 	for (std::vector<Test*>::const_iterator it = tests.begin(); it != tests.end(); ++it)
 	{
 		Test* testToRun = *it;
-		if(testToRun->getType() == Test::Long && !long_running)
+		if(testToRun->getType() == Test::Long && !longRunning)
 			continue;
 		if (setup.size() > 0)
 			testToRun->addSetup(setup);