Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STYLE: Change variable name to meet ITK style. #4702

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions Modules/Video/Core/test/itkTemporalProcessObjectTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace TemporalProcessObjectTest
using SizeValueType = itk::SizeValueType;
using OffsetValueType = itk::OffsetValueType;

/** \class CallRecordEnumms
/** \class CallRecordEnums
* \brief Contains all enum classes for CallRecord class.
*/
class CallRecordEnums
Expand Down Expand Up @@ -194,11 +194,11 @@ class CallRecord
* Static list of CallRecord items representing the stack trace of
* calls to GenerateData and TemporalStreamingGenerateData
*/
static std::vector<CallRecord> m_CallStack;
static std::vector<CallRecord> processCallStackTraceList;

/**
* \class DummyTemporalDataObject
* Create TemporaDataObject subclass that does nothing, but overrides some
* Create TemporalDataObject subclass that does nothing, but overrides some
* methods to provide debug output
*/
class DummyTemporalDataObject : public TemporalDataObject
Expand Down Expand Up @@ -278,7 +278,7 @@ class DummyTemporalDataObject : public TemporalDataObject
m_DataObjectBuffer->SetBufferContents(frameNumber, obj);
}

/** Get a bufferd frame */
/** Get a buffered frame */
DataObject::Pointer
GetFrame(SizeValueType frameNumber)
{
Expand Down Expand Up @@ -327,7 +327,7 @@ class DummyTemporalProcessObject : public TemporalProcessObject
TemporalStreamingGenerateData() override
{
// Create a START entry in the stack trace
m_CallStack.emplace_back(
processCallStackTraceList.emplace_back(
m_IdNumber, CallRecord::RecordTypeEnum::START_CALL, CallRecord::MethodTypeEnum::STREAMING_GENERATE_DATA);

// Report
Expand Down Expand Up @@ -369,7 +369,7 @@ class DummyTemporalProcessObject : public TemporalProcessObject
// this->GetOutput()->SetBufferedTemporalRegion(this->GetOutput()->GetRequestedTemporalRegion());

// Create an END entry in the stack trace
m_CallStack.emplace_back(
processCallStackTraceList.emplace_back(
m_IdNumber, CallRecord::RecordTypeEnum::END_CALL, CallRecord::MethodTypeEnum::STREAMING_GENERATE_DATA);
}

Expand Down Expand Up @@ -466,25 +466,25 @@ class DummyTemporalProcessObject : public TemporalProcessObject

/** Override UpdateOutputData for debug output */
void
UpdateOutputData(DataObject * dobj) override
UpdateOutputData(DataObject * dataObj) override
{
std::cout << "(ID = " << m_IdNumber << ") - UpdateOutputData" << std::endl;
Superclass::UpdateOutputData(dobj);
Superclass::UpdateOutputData(dataObj);
}

/** Override GenerateData for debug output */
void
GenerateData() override
{
// Create a START entry in the stack trace
m_CallStack.emplace_back(
processCallStackTraceList.emplace_back(
m_IdNumber, CallRecord::RecordTypeEnum::START_CALL, CallRecord::MethodTypeEnum::GENERATE_DATA);

std::cout << "*(ID = " << m_IdNumber << ") - GenerateData" << std::endl;
Superclass::GenerateData();

// Create an END entry in the stack trace
m_CallStack.emplace_back(
processCallStackTraceList.emplace_back(
m_IdNumber, CallRecord::RecordTypeEnum::END_CALL, CallRecord::MethodTypeEnum::GENERATE_DATA);
}

Expand Down Expand Up @@ -633,7 +633,7 @@ itkTemporalProcessObjectTest(int, char *[])
// Test Generation of data

// Call update to execute the entire pipeline and track the call stack
itk::TemporalProcessObjectTest::m_CallStack.clear();
itk::TemporalProcessObjectTest::processCallStackTraceList.clear();
tpo3->Update();

// Print out duration of buffered output region
Expand Down Expand Up @@ -706,21 +706,21 @@ itkTemporalProcessObjectTest(int, char *[])
correctCallStack.emplace_back(3, RecordType::RecordTypeEnum::END_CALL, RecordType::MethodTypeEnum::GENERATE_DATA);

// Check that correct number of calls made
ITK_TEST_EXPECT_EQUAL(itk::TemporalProcessObjectTest::m_CallStack.size(), correctCallStack.size());
ITK_TEST_EXPECT_EQUAL(itk::TemporalProcessObjectTest::processCallStackTraceList.size(), correctCallStack.size());

// Check that call lists match
std::cout << std::endl;
for (SizeValueType i = 0; i < itk::TemporalProcessObjectTest::m_CallStack.size(); ++i)
for (SizeValueType i = 0; i < itk::TemporalProcessObjectTest::processCallStackTraceList.size(); ++i)
{
if (itk::TemporalProcessObjectTest::m_CallStack[i] != correctCallStack[i])
if (itk::TemporalProcessObjectTest::processCallStackTraceList[i] != correctCallStack[i])
{
std::cerr << "Test failed!" << std::endl;
std::cerr << "Error in call stack at index [" << i << "]" << std::endl;
std::cerr << "Expected value ";
correctCallStack[i].Print();
std::cerr << std::endl;
std::cerr << " differs from ";
itk::TemporalProcessObjectTest::m_CallStack[i].Print();
itk::TemporalProcessObjectTest::processCallStackTraceList[i].Print();
return EXIT_FAILURE;
}
}
Expand All @@ -736,33 +736,33 @@ itkTemporalProcessObjectTest(int, char *[])
finalOutput->SetRequestedTemporalRegion(finalRequest);

// Call update to execute the entire pipeline and track the call stack
itk::TemporalProcessObjectTest::m_CallStack.clear();
itk::TemporalProcessObjectTest::processCallStackTraceList.clear();
tpo3->Update();

// Check that correct number of calls made
ITK_TEST_EXPECT_EQUAL(itk::TemporalProcessObjectTest::m_CallStack.size(), correctCallStack.size());
ITK_TEST_EXPECT_EQUAL(itk::TemporalProcessObjectTest::processCallStackTraceList.size(), correctCallStack.size());

// Check that call lists match
std::cout << std::endl;
for (SizeValueType i = 0; i < itk::TemporalProcessObjectTest::m_CallStack.size(); ++i)
for (SizeValueType i = 0; i < itk::TemporalProcessObjectTest::processCallStackTraceList.size(); ++i)
{
if (itk::TemporalProcessObjectTest::m_CallStack[i] != correctCallStack[i])
if (itk::TemporalProcessObjectTest::processCallStackTraceList[i] != correctCallStack[i])
{
std::cerr << "Test failed!" << std::endl;
std::cerr << "Error in call stack at index [" << i << "]" << std::endl;
std::cerr << "Expected value ";
correctCallStack[i].Print();
std::cerr << std::endl;
std::cerr << " differs from ";
itk::TemporalProcessObjectTest::m_CallStack[i].Print();
itk::TemporalProcessObjectTest::processCallStackTraceList[i].Print();
return EXIT_FAILURE;
}
}

// Call Update again and make sure that nothing happens except one call to
// GenerateData at the bottom which doesn't end up needing to do anything

itk::TemporalProcessObjectTest::m_CallStack.clear();
itk::TemporalProcessObjectTest::processCallStackTraceList.clear();
tpo3->Update();

correctCallStack.clear();
Expand All @@ -774,21 +774,21 @@ itkTemporalProcessObjectTest(int, char *[])
correctCallStack.emplace_back(3, RecordType::RecordTypeEnum::END_CALL, RecordType::MethodTypeEnum::GENERATE_DATA);

// Check that correct number of calls made
ITK_TEST_EXPECT_EQUAL(itk::TemporalProcessObjectTest::m_CallStack.size(), correctCallStack.size());
ITK_TEST_EXPECT_EQUAL(itk::TemporalProcessObjectTest::processCallStackTraceList.size(), correctCallStack.size());

// Check that call lists match
std::cout << std::endl;
for (SizeValueType i = 0; i < itk::TemporalProcessObjectTest::m_CallStack.size(); ++i)
for (SizeValueType i = 0; i < itk::TemporalProcessObjectTest::processCallStackTraceList.size(); ++i)
{
if (itk::TemporalProcessObjectTest::m_CallStack[i] != correctCallStack[i])
if (itk::TemporalProcessObjectTest::processCallStackTraceList[i] != correctCallStack[i])
{
std::cerr << "Test failed!" << std::endl;
std::cerr << "Error in call stack at index [" << i << "]" << std::endl;
std::cerr << "Expected value ";
correctCallStack[i].Print();
std::cerr << std::endl;
std::cerr << " differs from ";
itk::TemporalProcessObjectTest::m_CallStack[i].Print();
itk::TemporalProcessObjectTest::processCallStackTraceList[i].Print();
return EXIT_FAILURE;
}
}
Expand All @@ -797,7 +797,7 @@ itkTemporalProcessObjectTest(int, char *[])
// process object gets set to the largest possible temporal region if no
// temporal region has been set

// Reset tpo1 and the requsted temporal region of tdo
// Reset tpo1 and the requested temporal region of tdo
tpo1 = TPOType::New();
itk::TemporalRegion emptyRegion;
tdo->SetRequestedTemporalRegion(emptyRegion);
Expand All @@ -812,7 +812,7 @@ itkTemporalProcessObjectTest(int, char *[])
tpo1->GetOutput()->GetLargestPossibleTemporalRegion());
ITK_TEST_EXPECT_TRUE(!(tpo1->GetOutput()->GetRequestedTemporalRegion() == emptyRegion));

// Test that if largest possible temporal region has infinte duration,
// Test that if largest possible temporal region has infinite duration,
// request gets set to duration 1
tpo1 = TPOType::New();
largestRegion = tdo->GetLargestPossibleTemporalRegion();
Expand All @@ -837,7 +837,7 @@ itkTemporalProcessObjectTest(int, char *[])
std::cout << "STREAMED ENUM VALUE CallRecordEnums::RecordType: " << ee << std::endl;
}

// Test streaming enitk::TemporalProcessObjectTest::CallRecordEnumscordEnums::MethodType elements
// Test streaming itk::TemporalProcessObjectTest::CallRecordEnums::MethodType elements
const std::set<itk::TemporalProcessObjectTest::CallRecordEnums::MethodType> allMethodType{
itk::TemporalProcessObjectTest::CallRecordEnums::MethodType::GENERATE_DATA,
itk::TemporalProcessObjectTest::CallRecordEnums::MethodType::STREAMING_GENERATE_DATA,
Expand Down