TEST_MAIN() no longer has argc/argv

ngageoint · May 12, 2022 · 2879a25 · 2879a25
1 parent a1c6503
commit 2879a25
Show file tree

Hide file tree

Showing 36 changed files with 36 additions and 36 deletions.
diff --git a/six/modules/c++/cphd/unittests/test_channel.cpp b/six/modules/c++/cphd/unittests/test_channel.cpp
@@ -81,7 +81,7 @@ TEST_CASE(TxRcvMultIds)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(EmptyChannel);
         TEST_CHECK(TestPolygonInvalid);
         TEST_CHECK(TxRcvMultIds);

diff --git a/six/modules/c++/cphd/unittests/test_compressed_signal_block_round.cpp b/six/modules/c++/cphd/unittests/test_compressed_signal_block_round.cpp
@@ -148,7 +148,7 @@ TEST_CASE(testCompressed)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testCompressed);
 )
 
diff --git a/six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp b/six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp
@@ -1140,7 +1140,7 @@ TEST_CASE(testReadXML)
     TEST_ASSERT_EQ(ref.monostatic->dopplerConeAngle, 30.0);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testReadXML);
         // TEST_CHECK(testValidation);
 )
diff --git a/six/modules/c++/cphd/unittests/test_cphd_xml_optional.cpp b/six/modules/c++/cphd/unittests/test_cphd_xml_optional.cpp
@@ -1124,6 +1124,6 @@ TEST_CASE(testOptional)
     TEST_ASSERT_EQ(matchInfo.types[1].matchCollects[0].parameters[0].getName(), "param1");
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testOptional);
 )
diff --git a/six/modules/c++/cphd/unittests/test_dwell.cpp b/six/modules/c++/cphd/unittests/test_dwell.cpp
@@ -116,7 +116,7 @@ TEST_CASE(testEquality)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testDerivativeCODValid);
         TEST_CHECK(testDerivativeDwellValid);
         TEST_CHECK(testEquality);

diff --git a/six/modules/c++/cphd/unittests/test_file_header.cpp b/six/modules/c++/cphd/unittests/test_file_header.cpp
@@ -153,7 +153,7 @@ TEST_CASE(testRoundTripHeader)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testReadVersion);
         TEST_CHECK(testCanReadHeaderWithoutBreaking);
         TEST_CHECK(testRoundTripHeader);

diff --git a/six/modules/c++/cphd/unittests/test_pvp.cpp b/six/modules/c++/cphd/unittests/test_pvp.cpp
@@ -104,7 +104,7 @@ TEST_CASE(testAddedParamsEqualityOperatorFalse)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testSimpleEqualityOperatorTrue);
         TEST_CHECK(testAppend);
         TEST_CHECK(testAddedParamsEqualityOperatorTrue);

diff --git a/six/modules/c++/cphd/unittests/test_pvp_block.cpp b/six/modules/c++/cphd/unittests/test_pvp_block.cpp
@@ -344,7 +344,7 @@ static void* call_srand()
 }
 static const auto unused_ = call_srand();
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testPvpRequired);
     TEST_CHECK(testPvpOptional);
     TEST_CHECK(testPvpThrow);

diff --git a/six/modules/c++/cphd/unittests/test_read_wideband.cpp b/six/modules/c++/cphd/unittests/test_read_wideband.cpp
@@ -204,7 +204,7 @@ TEST_CASE(testCannotDoPartialReadOfCompressedChannel)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testReadCompressedChannel);
     TEST_CHECK(testReadUncompressedChannel);
     TEST_CHECK(testReadChannelSubset);

diff --git a/six/modules/c++/cphd/unittests/test_reference_geometry.cpp b/six/modules/c++/cphd/unittests/test_reference_geometry.cpp
@@ -61,6 +61,6 @@ TEST_CASE(testEquality)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testEquality);
 )
diff --git a/six/modules/c++/cphd/unittests/test_support_block_round.cpp b/six/modules/c++/cphd/unittests/test_support_block_round.cpp
@@ -165,7 +165,7 @@ TEST_CASE(testSupportsDouble)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
         TEST_CHECK(testSupportsInt);
         TEST_CHECK(testSupportsDouble);
         )
diff --git a/six/modules/c++/cphd03/unittests/test_cphd_write.cpp b/six/modules/c++/cphd03/unittests/test_cphd_write.cpp
@@ -491,7 +491,7 @@ static int call_srand()
 }
 static int unused_ = call_srand();
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testWriteFXOneWay);
     TEST_CHECK(testWriteFXTwoWay);
     TEST_CHECK(testWriteTOAOneWay);

diff --git a/six/modules/c++/cphd03/unittests/test_vbm.cpp b/six/modules/c++/cphd03/unittests/test_vbm.cpp
@@ -293,7 +293,7 @@ static int call_srand()
 }
 static int unused_ = call_srand();
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testVbmFx);
     TEST_CHECK(testVbmToa);
     TEST_CHECK(testVbmThrow);

diff --git a/six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp b/six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp
@@ -759,7 +759,7 @@ TEST_CASE(test_ComplexToAMP8IPHS8I)
     }
 }
 
-TEST_MAIN((void)argc; (void)argv;
+TEST_MAIN(
     TEST_CHECK(test_8bit_ampphs);
     TEST_CHECK(read_8bit_ampphs_with_table);
     TEST_CHECK(read_8bit_ampphs_no_table);

diff --git a/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp b/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp
@@ -121,7 +121,7 @@ TEST_CASE(ClassificationCanada)
     TEST_ASSERT_EQ(characterData, classificationText);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DummyData);
     TEST_CHECK(FakeComplexData);
     TEST_CHECK(Classification);

diff --git a/six/modules/c++/six.sicd/unittests/test_area_plane.cpp b/six/modules/c++/six.sicd/unittests/test_area_plane.cpp
@@ -220,7 +220,7 @@ TEST_CASE(testCanRotateFourTimes)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testAreaPlane);
     TEST_CHECK(testBothMethodsGiveSamePlane);
     TEST_CHECK(testRotatePlane);

diff --git a/six/modules/c++/six.sicd/unittests/test_filling_geo_data.cpp b/six/modules/c++/six.sicd/unittests/test_filling_geo_data.cpp
@@ -112,7 +112,7 @@ TEST_CASE(ecfFromLlh)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(ecfFromLlh);
     TEST_CHECK(fillValidData);
     )
diff --git a/six/modules/c++/six.sicd/unittests/test_filling_grid.cpp b/six/modules/c++/six.sicd/unittests/test_filling_grid.cpp
@@ -324,7 +324,7 @@ TEST_CASE(DefaultFromPFA)
     TEST_ASSERT_ALMOST_EQ(grid.col->kCenter, 0);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DerivedDeltaKsNoImageData);
     TEST_CHECK(DerivedDeltaKsWithImageData);
     TEST_CHECK(IdentityWeightFunction);

diff --git a/six/modules/c++/six.sicd/unittests/test_filling_pfa.cpp b/six/modules/c++/six.sicd/unittests/test_filling_pfa.cpp
@@ -54,6 +54,6 @@ TEST_CASE(DefaultPFA)
     TEST_ASSERT_EQ(pfa.polarAngleRefTime, 123);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DefaultPFA);
 )
diff --git a/six/modules/c++/six.sicd/unittests/test_filling_position.cpp b/six/modules/c++/six.sicd/unittests/test_filling_position.cpp
@@ -56,6 +56,6 @@ TEST_CASE(DerivedArpPoly)
     TEST_ASSERT_EQ(position.arpPoly[2][2], 3);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DerivedArpPoly);
 )
diff --git a/six/modules/c++/six.sicd/unittests/test_filling_rgazcomp.cpp b/six/modules/c++/six.sicd/unittests/test_filling_rgazcomp.cpp
@@ -77,7 +77,7 @@ TEST_CASE(DerivedRgAzComp)
     TEST_ASSERT_ALMOST_EQ(rgAzComp.kazPoly[3], 4.04227407e-05);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DerivedRgAzComp);
 )
 
diff --git a/six/modules/c++/six.sicd/unittests/test_filling_rma.cpp b/six/modules/c++/six.sicd/unittests/test_filling_rma.cpp
@@ -94,7 +94,7 @@ TEST_CASE(DerivedINCA)
     TEST_ASSERT_ALMOST_EQ(rma.inca->rangeCA, 372.0282247);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DerivedRMATandRMCR);
     TEST_CHECK(DerivedINCA);
     )
diff --git a/six/modules/c++/six.sicd/unittests/test_filling_scpcoa.cpp b/six/modules/c++/six.sicd/unittests/test_filling_scpcoa.cpp
@@ -80,6 +80,6 @@ TEST_CASE(DerivedSCPCOA)
     TEST_ASSERT_ALMOST_EQ(scpcoa.layoverAngle, 201.9977459);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(DerivedSCPCOA);
 )
diff --git a/six/modules/c++/six.sicd/unittests/test_get_segment.cpp b/six/modules/c++/six.sicd/unittests/test_get_segment.cpp
@@ -71,7 +71,7 @@ TEST_CASE(testHandlesNullPointers)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testCanFindSegment);
     TEST_CHECK(testThrowIfMissingSegment);
     TEST_CHECK(testHandlesNullPointers);

diff --git a/six/modules/c++/six.sicd/unittests/test_projection_polynomial_fitter.cpp b/six/modules/c++/six.sicd/unittests/test_projection_polynomial_fitter.cpp
@@ -156,7 +156,7 @@ TEST_CASE(testProjectSlantToOutput)
 }
 }
 
-TEST_MAIN((void)argc; (void)argv;
+TEST_MAIN(
     TEST_CHECK(testProjectOutputToSlant);
     TEST_CHECK(testProjectSlantToOutput);
     )
diff --git a/six/modules/c++/six.sicd/unittests/test_radar_collection.cpp b/six/modules/c++/six.sicd/unittests/test_radar_collection.cpp
@@ -79,7 +79,7 @@ TEST_CASE(wfParamTxFrequencies)
     TEST_ASSERT_EQ(radarCollection.waveform[0]->txRFBandwidth, 4);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(fmRateFromDemodType);
     TEST_CHECK(demodTypeFromFmRate);
     TEST_CHECK(pulseLength);

diff --git a/six/modules/c++/six.sicd/unittests/test_update_sicd_version.cpp b/six/modules/c++/six.sicd/unittests/test_update_sicd_version.cpp
@@ -121,7 +121,7 @@ TEST_CASE(testWarningParameters)
     TEST_ASSERT_FALSE(parameters.empty());
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     // These tests should suffice to cover all of the "tricky"
     // logic in the implementation.  Any remaining bugs would
     // most likely be due to misreading the standards.

diff --git a/six/modules/c++/six.sicd/unittests/test_utilities.cpp b/six/modules/c++/six.sicd/unittests/test_utilities.cpp
@@ -45,7 +45,7 @@ TEST_CASE(testCounterClockwiseTriangle)
     TEST_ASSERT(six::sicd::Utilities::isClockwise(vertices));
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testClockwiseBox);
     TEST_CHECK(testCounterClockwiseTriangle);
 )

diff --git a/six/modules/c++/six.sicd/unittests/test_valid_six.cpp b/six/modules/c++/six.sicd/unittests/test_valid_six.cpp
@@ -504,7 +504,7 @@ TEST_CASE(test_create_sicd_from_mem_32f)
     test_create_sicd_from_mem("test_create_sicd_from_mem_32f.sicd", six::PixelType::RE32F_IM32F);
 }
 
-TEST_MAIN((void)argc; (void)argv;
+TEST_MAIN(
     TEST_CHECK(valid_six_50x50);
     TEST_CHECK(sicd_French_xml_raw);
     TEST_CHECK(sicd_French_xml);

diff --git a/six/modules/c++/six.sidd/unittests/test_read_sidd_legend.cpp b/six/modules/c++/six.sidd/unittests/test_read_sidd_legend.cpp
@@ -342,7 +342,7 @@ TEST_CASE(test_getParser)
 
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testRead);
     TEST_CHECK(test_getParser);
     )
diff --git a/six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp b/six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp
@@ -177,7 +177,7 @@ TEST_CASE(test_read_sidd300_xml)
     test_read_sidd_xml("sidd300.xml");
 }
 
-TEST_MAIN((void)argc; (void)argv;
+TEST_MAIN(
     TEST_CHECK(test_createFakeDerivedData);
     TEST_CHECK(test_read_sidd200_xml);
     TEST_CHECK(test_read_sidd300_xml);

diff --git a/six/modules/c++/six.sidd/unittests/unittest_sidd_byte_provider.cpp b/six/modules/c++/six.sidd/unittests/unittest_sidd_byte_provider.cpp
@@ -776,7 +776,7 @@ TEST_CASE(forcing_various_numbers_of_segments)
 }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(no_funky_segmentation);
     TEST_CHECK(forcing_various_numbers_of_segments);
 )

diff --git a/six/modules/c++/six/unittests/test_fft_sign_conversions.cpp b/six/modules/c++/six/unittests/test_fft_sign_conversions.cpp
@@ -18,6 +18,6 @@ TEST_CASE(testToType)
 
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(testToType);
     )
diff --git a/six/modules/c++/six/unittests/test_polarization_type_conversions.cpp b/six/modules/c++/six/unittests/test_polarization_type_conversions.cpp
@@ -67,7 +67,7 @@ TEST_CASE(EqInt)
     TEST_ASSERT_EQ(fromStrCtor, fromIntCtor);
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(EnumConstructor);
     TEST_CHECK(ToType);
     TEST_CHECK(SixToString);

diff --git a/six/modules/c++/six/unittests/test_serialize.cpp b/six/modules/c++/six/unittests/test_serialize.cpp
@@ -139,7 +139,7 @@ TEST_CASE(VectorSerialize)
     TEST_ASSERT_TRUE(testVector<double>(length, true));
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     srand(static_cast<unsigned int>(time(NULL)));
     TEST_CHECK(ScalarSerialize);
     TEST_CHECK(VectorSerialize);

diff --git a/six/modules/c++/six/unittests/test_xml_control.cpp b/six/modules/c++/six/unittests/test_xml_control.cpp
@@ -96,7 +96,7 @@ TEST_CASE(ignoreEmptyEnvVariable)
     }
 }
 
-TEST_MAIN((void)argv; (void)argc;
+TEST_MAIN(
     TEST_CHECK(loadCompiledSchemaPath);
     TEST_CHECK(respectGivenPaths);
     TEST_CHECK(loadFromEnvVariable);