@@ -73,59 +73,42 @@ itkFreeSurferMeshIOTestHelper(typename TMeshIO::Pointer fsMeshIO,
73
73
ITK_TEST_EXPECT_EQUAL (numberOfCells, fsMeshIO->GetNumberOfCells ());
74
74
ITK_TEST_EXPECT_EQUAL (numberOfCellPixels, fsMeshIO->GetNumberOfCellPixels ());
75
75
76
- // Use sufficiently large buffer sizes
77
- itk::SizeValueType pointBufferSize = 2000 ;
78
- itk::SizeValueType pointDataBufferSize = 2000 ;
79
-
80
- itk::SizeValueType cellBufferSize = 2000 ;
76
+ itk::SizeValueType pointBufferSize = 3 * sizeof (float ) * fsMeshIO->GetNumberOfPoints ();
77
+ itk::SizeValueType cellBufferSize = 3 * sizeof (uint32_t ) * fsMeshIO->GetNumberOfCells ();
81
78
82
79
const std::shared_ptr<void > pointBuffer =
83
80
itk::MeshIOTestHelper::AllocateBuffer (fsMeshIO->GetPointComponentType (), pointBufferSize);
84
- const std::shared_ptr<void > pointDataBuffer =
85
- itk::MeshIOTestHelper::AllocateBuffer (fsMeshIO->GetPointPixelComponentType (), pointDataBufferSize);
86
81
const std::shared_ptr<void > cellBuffer =
87
82
itk::MeshIOTestHelper::AllocateBuffer (fsMeshIO->GetCellComponentType (), cellBufferSize);
88
83
89
84
ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->ReadPoints (pointBuffer.get ()));
90
- ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->ReadPointData (pointDataBuffer.get ()));
91
-
92
85
ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->ReadCells (cellBuffer.get ()));
93
86
94
- void * cellDataBuffer = nullptr ;
95
87
// Not used; empty method body; called for coverage purposes
96
- fsMeshIO->ReadCellData (cellDataBuffer );
88
+ fsMeshIO->ReadCellData (nullptr );
97
89
98
90
// Test writing exceptions
99
91
fsMeshIO->SetFileName (" " );
92
+ ITK_TRY_EXPECT_EXCEPTION (fsMeshIO->WriteMeshInformation ());
100
93
ITK_TRY_EXPECT_EXCEPTION (fsMeshIO->WritePoints (pointBuffer.get ()));
101
- if (dynamic_cast <itk::FreeSurferBinaryMeshIO *>(fsMeshIO.GetPointer ()))
102
- {
103
- ITK_TRY_EXPECT_EXCEPTION (fsMeshIO->WritePointData (pointDataBuffer.get ()));
104
- }
105
-
106
94
ITK_TRY_EXPECT_EXCEPTION (fsMeshIO->WriteCells (cellBuffer.get ()));
107
- ITK_TRY_EXPECT_EXCEPTION (fsMeshIO->WriteMeshInformation ());
108
95
109
96
ITK_TEST_EXPECT_TRUE (!fsMeshIO->CanWriteFile (notAFsOutputFileName));
110
97
111
98
ITK_TEST_EXPECT_TRUE (fsMeshIO->CanWriteFile (outputFileName));
112
99
fsMeshIO->SetFileName (outputFileName);
113
100
114
101
// Write the actual data
102
+ ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->WriteMeshInformation ());
115
103
ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->WritePoints (pointBuffer.get ()));
116
- ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->WritePointData (pointDataBuffer.get ()));
117
-
118
104
ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->WriteCells (cellBuffer.get ()));
119
105
120
106
// Not used; empty method body; called for coverage purposes
121
- fsMeshIO->WriteCellData (cellDataBuffer);
122
-
123
- ITK_TRY_EXPECT_NO_EXCEPTION (fsMeshIO->WriteMeshInformation ());
107
+ fsMeshIO->WriteCellData (nullptr );
124
108
125
109
// Not used; empty method body; called for coverage purposes
126
110
fsMeshIO->Write ();
127
111
128
-
129
112
// Read back the written image and check the properties
130
113
readWritefsMeshIO->SetFileName (outputFileName);
131
114
readWritefsMeshIO->ReadMeshInformation ();
0 commit comments