From 29b517e68fc04d695a1085a3cf1f6e8d2797763c Mon Sep 17 00:00:00 2001 From: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Date: Fri, 4 Jun 2021 14:49:57 -0700 Subject: [PATCH] improve grid extend test case (#4506) --- isis/tests/FunctionalTestsGrid.cpp | 16 ++++++++++++---- isis/tests/data/defaultImage/extendProj.map | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100755 isis/tests/data/defaultImage/extendProj.map diff --git a/isis/tests/FunctionalTestsGrid.cpp b/isis/tests/FunctionalTestsGrid.cpp index 86ce07b0dd..7955ec49e3 100644 --- a/isis/tests/FunctionalTestsGrid.cpp +++ b/isis/tests/FunctionalTestsGrid.cpp @@ -263,7 +263,15 @@ TEST_F(NewHorizonsCube, FunctionalTestGridBandDependent) { TEST_F(DefaultCube, FunctionalTestGridExtend) { QVector args = {"to=" + tempDir.path() + "/output.cub", "extendgrid=true"}; UserInterface options(APP_XML, args); - grid(testCube, options); + + // change mapping group of cube to one that extends past longitude domain + Pvl newMap; + newMap.read("data/defaultImage/extendProj.map"); + PvlGroup &newMapGrp = newMap.findGroup("Mapping", Pvl::Traverse); + + projTestCube->putGroup(newMapGrp); + + grid(projTestCube, options); Cube outputCube; try { @@ -275,13 +283,13 @@ TEST_F(DefaultCube, FunctionalTestGridExtend) { // Check beginning and end of gridline LineManager line(outputCube); - line.SetLine(579); + line.SetLine(1); outputCube.read(line); EXPECT_EQ(line[0], Isis::Hrs); - line.SetLine(1056); + line.SetLine(1); outputCube.read(line); - EXPECT_EQ(line[247], Isis::Hrs); + EXPECT_EQ(line[2], Isis::Hrs); outputCube.close(); } diff --git a/isis/tests/data/defaultImage/extendProj.map b/isis/tests/data/defaultImage/extendProj.map new file mode 100755 index 0000000000..a4b7495659 --- /dev/null +++ b/isis/tests/data/defaultImage/extendProj.map @@ -0,0 +1,18 @@ +Group = Mapping + ProjectionName = Sinusoidal + CenterLongitude = 370.0 + TargetName = MARS + EquatorialRadius = 3396190.0 + PolarRadius = 3376200.0 + LatitudeType = Planetocentric + LongitudeDirection = PositiveEast + LongitudeDomain = 360 + MinimumLatitude = 0 + MaximumLatitude = 10 + MinimumLongitude = 361 + MaximumLongitude = 380 + UpperLeftCornerX = 0.0 + UpperLeftCornerY = 600000.0 + PixelResolution = 100000.0 + Scale = 0.59274697523306 +End_Group -- GitLab