Unverified Commit da391b81 authored by Amy Stamile's avatar Amy Stamile Committed by GitHub
Browse files

Clean Mac Tests Failures (#5082) 

* Fixes mac gtests failures

* removed debug lines

* Updated FunctionalTestHimosDefault test

* fixes TgoCassisTestProjSingleStitchedFrame test
parent bb6d639d

isis/tests/FunctionalTestsFindfeatures.cpp

+10 −10
Original line number Diff line number Diff line
@@ -74,30 +74,30 @@ TEST_F(ThreeImageNetwork, FunctionalTestFindfeaturesGeomMatch) { 
  //Control point with a single measure

  ControlPoint *pt = network.GetPoint("test_network_0001");

  ControlMeasure *cm = pt->GetMeasure(SerialNumber::Compose(*cube2));

  EXPECT_DOUBLE_EQ(cm->GetSample(), 60.719512939453125);

  EXPECT_DOUBLE_EQ(cm->GetLine(), 31.866861343383789);

  EXPECT_NEAR(cm->GetSample(), 60.719512939453125, 1e-6);

  EXPECT_NEAR(cm->GetLine(), 31.866861343383789, 1e-6);

  SurfacePoint sp = pt->GetAprioriSurfacePoint();

  Latitude lat = sp.GetLatitude();

  Longitude lon = sp.GetLongitude();

  EXPECT_DOUBLE_EQ(lat.planetocentric(), 0.025811899541941467);

  EXPECT_DOUBLE_EQ(lon.positiveEast(), 0.0012615634743558179);

  EXPECT_NEAR(lat.planetocentric(), 0.025811899541941467, 1e-6);

  EXPECT_NEAR(lon.positiveEast(), 0.0012615634743558179, 1e-6);





  // Control point with two measures

  pt = network.GetPoint("test_network_0018");

  cm = pt->GetMeasure(SerialNumber::Compose(*cube2));

  EXPECT_DOUBLE_EQ(cm->GetSample(), 143.62646484375);

  EXPECT_DOUBLE_EQ(cm->GetLine(), 69.777481079101562);

  EXPECT_NEAR(cm->GetSample(), 143.62646484375, 1e-6);

  EXPECT_NEAR(cm->GetLine(), 69.777481079101562, 1e-6);



  cm = pt->GetMeasure(SerialNumber::Compose(*cube1));

  EXPECT_DOUBLE_EQ(cm->GetSample(), 383.62646484375);

  EXPECT_DOUBLE_EQ(cm->GetLine(), 81.777481079101562);

  EXPECT_NEAR(cm->GetSample(), 383.62646484375, 1e-6);

  EXPECT_NEAR(cm->GetLine(), 81.777481079101562, 1e-6);



  sp = pt->GetAprioriSurfacePoint();

  lat = sp.GetLatitude();

  lon = sp.GetLongitude();

  EXPECT_DOUBLE_EQ(lat.planetocentric(), 0.028914626048514001);

  EXPECT_DOUBLE_EQ(lon.positiveEast(), 0.0071459947198023819);

  EXPECT_NEAR(lat.planetocentric(), 0.028914626048514001, 1e-6);

  EXPECT_NEAR(lon.positiveEast(), 0.0071459947198023819, 1e-6);

}

isis/tests/FunctionalTestsHimos.cpp

+20 −29
Original line number Diff line number Diff line
@@ -48,39 +48,30 @@ TEST_F(MroHiriseCube, FunctionalTestHimosDefault) { 
  EXPECT_EQ(double(pixels["Base"]), 1.4996565881653);

  EXPECT_EQ(double(pixels["Multiplier"]), 4.57882446313283e-05);





  PvlGroup inputMappingGroup = inputCubeLabel.findGroup("Mapping");

  PvlGroup outputMappingGroup = outputCubeLabel.findGroup("Mapping");

  EXPECT_PRED_FORMAT2(AssertPvlGroupEqual, inputMappingGroup, outputMappingGroup);



  std::istringstream mosaicStream(R"(

  Group = Mosaic

    ProductId                 = TRA_000823_1720_BLUEGREEN

    SourceProductId           = (TRA_000823_1720_RED4_0, TRA_000823_1720_RED4_1)

    StartTime                 = 2006-09-29T15:16:33.385

    SpacecraftClockStartCount = 844010212:12516

    StopTime                  = 2006-09-29T15:16:35.036

    SpacecraftClockStopCount  = 844010213:55196

    IncidenceAngle            = 59.687930340662 <DEG>

    EmissionAngle             = 0.091672512443932 <DEG>

    PhaseAngle                = 59.597812369363 <DEG>

    LocalTime                 = 15.486088288555 <LOCALDAY/24>

    SolarLongitude            = 113.54746578654 <DEG>

    SubSolarAzimuth           = 212.41484032558 <DEG>

    NorthAzimuth              = 270.00024569628 <DEG>

    cpmmTdiFlag               = (Null, Null, Null, Null, Null, 128, Null, Null,

                                 Null, Null, Null, Null, Null, Null)

    cpmmSummingFlag           = (Null, Null, Null, Null, Null, 1, Null, Null,

                                 Null, Null, Null, Null, Null, Null)

    SpecialProcessingFlag     = (Null, Null, Null, Null, Null, NOMINAL, Null,

                                 Null, Null, Null, Null, Null, Null, Null)

  End_Group

  )");

  PvlGroup mosaicGroupTruth;

  mosaicStream >> mosaicGroupTruth;

  PvlGroup outputMosaicGroup = outputCubeLabel.findGroup("Mosaic");

  EXPECT_PRED_FORMAT2(AssertPvlGroupEqual, mosaicGroupTruth, outputMosaicGroup);



  PvlGroup mos = outputCubeLabel.findGroup("Mosaic");

  EXPECT_EQ(mos["ProductId"][0].toStdString(), "TRA_000823_1720_BLUEGREEN");

  EXPECT_EQ(mos["SourceProductId"][0].toStdString(), "TRA_000823_1720_RED4_0");

  EXPECT_EQ(mos["SourceProductId"][1].toStdString(), "TRA_000823_1720_RED4_1");

  EXPECT_EQ(mos["StartTime"][0].toStdString(), "2006-09-29T15:16:33.385");

  EXPECT_EQ(mos["SpacecraftClockStartCount"][0].toStdString(), "844010212:12516");

  EXPECT_EQ(mos["StopTime"][0].toStdString(), "2006-09-29T15:16:35.036");

  EXPECT_EQ(mos["SpacecraftClockStopCount"][0].toStdString(), "844010213:55196");



  EXPECT_NEAR(mos["IncidenceAngle"][0].toDouble(), 59.687930340662, 1e-6);

  EXPECT_NEAR(mos["EmissionAngle"][0].toDouble(), 0.091672512439956, 1e-6);

  EXPECT_NEAR(mos["PhaseAngle"][0].toDouble(), 59.597812369363, 1e-6);

  EXPECT_NEAR(mos["LocalTime"][0].toDouble(), 15.486088288555, 1e-6);

  EXPECT_NEAR(mos["SolarLongitude"][0].toDouble(), 113.54746578654, 1e-6);

  EXPECT_NEAR(mos["SubSolarAzimuth"][0].toDouble(), 212.41484032558 , 1e-6);

  EXPECT_NEAR(mos["NorthAzimuth"][0].toDouble(), 270.00024569628, 1e-6);



  EXPECT_EQ(mos["cpmmTdiFlag"][5].toStdString(), "128");

  EXPECT_EQ(mos["cpmmSummingFlag"][5].toStdString(), "1");

  EXPECT_EQ(mos["SpecialProcessingFlag"][5].toStdString(), "NOMINAL");

}



TEST_F(MroHiriseCube, FunctionalTestHimosError) {

isis/tests/TgoCassisModuleTests.cpp

+13 −23
Original line number Diff line number Diff line
@@ -2277,7 +2277,7 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { 
    FAIL() << "Unable to run spiceinit  on nir image: " << e.what() << std::endl;

  }



  // run stitch and unstitch on cube list

  // run stitch on cube list

  FileList *cubeList = new FileList();

  cubeList->append(panFileName);

  cubeList->append(bluFileName);
@@ -2317,14 +2317,15 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { 
    FAIL() << "Unable to run mosrange with cube list: " << e.what() << std::endl;

  }



  // run cam2map and cassismos on pan cube

  // run cam2map on stitched cube

  QString projectedFile = prefix.path() + "/projected.cub";

  QVector<QString> cam2mapArgs = {"from=" + tgocassisstitchOutput,

                                  "to=" + projectedFile,

                                  "map=" + mapFile,};

  UserInterface cam2mapPan(CAM2MAP_XML, cam2mapArgs);

                                  "map=" + mapFile,

                                  "pixres=map"};

  UserInterface cam2mapOptions(CAM2MAP_XML, cam2mapArgs);

  try {

    cam2map(cam2mapPan);

    cam2map(cam2mapOptions);

  }

  catch (IException &e) {

    FAIL() << "Unable to run cam2map on stitched image: " << e.what() << std::endl;
@@ -2341,17 +2342,6 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { 
    FAIL() << "Unable to run tgocassisrdrgen on projected image: " << e.what() << std::endl;

  }

  

  // QString ingestedExportFile = prefix.path() + "/exported.cub";

  // tgocassis2isisArgs = {"from=" + prefix.path() + "/exported.xml",

  //                       "to=" + ingestedExportFile};

  // UserInterface tgocassis2isisIngest(TGOCASSIS2ISIS_XML, tgocassis2isisArgs);

  // try {

  //   tgocassis2isis(tgocassis2isisIngest);

  // }

  // catch (IException &e) {

  //   FAIL() << "Unable to run tgocassis2isis on output image: " << e.what() << std::endl;

  // }



  // Mosaic Cube

  Cube exportCube(projectedFile);

  Pvl *outLabel = exportCube.label();
@@ -2747,10 +2737,10 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { 
      MaximumLatitude    = 2.7054455166927

      MinimumLongitude   = 266.09781108551

      MaximumLongitude   = 266.34204815257

      UpperLeftCornerX   = -7234.9327157961 <meters>

      UpperLeftCornerY   = 160368.69134142 <meters>

      PixelResolution    = 6.7806304740357 <meters/pixel>

      Scale              = 8741.6622669795 <pixels/degree>

      UpperLeftCornerX   = -7233.2769909138 <meters>

      UpperLeftCornerY   = 160363.72421906 <meters>

      PixelResolution    = 6.80458795006 <meters/pixel>

      Scale              = 8710.8847730724 <pixels/degree>

      CenterLatitude     = 2.584937425328

    End_Group

  )");
@@ -2765,7 +2755,7 @@ TEST_F(TgoCassisModuleKernels, TgoCassisTestProjSingleStitchedFrame) { 
  Histogram *hist = exportCube.histogram();



  EXPECT_NEAR(hist->Average(), 0.26625623495550205, 0.0001);

  EXPECT_NEAR(hist->Sum(), 444615.96850222297, 0.0001);

  EXPECT_EQ(hist->ValidPixels(), 1669880);

  EXPECT_NEAR(hist->Sum(), 441491.9287794265, 0.001);

  EXPECT_EQ(hist->ValidPixels(), 1658108);

  EXPECT_NEAR(hist->StandardDeviation(), 0.048925404459616698, 0.0001);

}