Commit 287d8bad authored by Kristin Berry's avatar Kristin Berry
Browse files

Resolve merge conflicts with FrameIsdTest vs. SimpleFrameIsdTest names

parent f77a2f26

tests/Fixtures.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class FrameSensorModel : public ::testing::Test { 
      }

};



class SimpleFrameIsdTest : public ::testing::Test {

class FrameIsdTest : public ::testing::Test {

   protected:

      csm::Isd isd;

tests/FramePluginTests.cpp

+4 −4
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ TEST(FramePluginTests, MissingStateValue) { 
         badState));;

}



TEST_F(SimpleFrameIsdTest, Constructible) {

TEST_F(FrameIsdTest, Constructible) {

   UsgsAstroFramePlugin testPlugin;

   EXPECT_TRUE(testPlugin.canModelBeConstructedFromISD(

               isd,

               "USGS_ASTRO_FRAME_SENSOR_MODEL"));

}



TEST_F(SimpleFrameIsdTest, NotConstructible) {

TEST_F(FrameIsdTest, NotConstructible) {

   UsgsAstroFramePlugin testPlugin;

   isd.setFilename("Not a file");

   EXPECT_FALSE(testPlugin.canModelBeConstructedFromISD(
@@ -78,7 +78,7 @@ TEST_F(SimpleFrameIsdTest, NotConstructible) { 
                "USGS_ASTRO_FRAME_SENSOR_MODEL"));

}



TEST_F(SimpleFrameIsdTest, ConstructValidCamera) {

TEST_F(FrameIsdTest, ConstructValidCamera) {

   UsgsAstroFramePlugin testPlugin;

   csm::Model *cameraModel = NULL;

   EXPECT_NO_THROW(
@@ -94,7 +94,7 @@ TEST_F(SimpleFrameIsdTest, ConstructValidCamera) { 
   }

}



TEST_F(SimpleFrameIsdTest, ConstructInValidCamera) {

TEST_F(FrameIsdTest, ConstructInValidCamera) {

   UsgsAstroFramePlugin testPlugin;

   // Remove the model_name keyword from the ISD to make it invalid

   isd.clearParams("model_name");