Unverified Commit ac93480e authored by AustinSanders's avatar AustinSanders Committed by GitHub
Browse files

Normalized test names and file names (#4366)

* Normalized test names and file names

* Addressed PR feedback
parent ad0fad46
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ using namespace Isis;

static QString APP_XML = FileName("$ISISROOT/bin/xml/apollocal.xml").expanded();

TEST_F(ApolloCube, FunctionalTestApolloCalDefault) {
TEST_F(ApolloCube, FunctionalTestApollocalDefault) {
  QTemporaryDir prefix;

  QString outCubeFileName = prefix.path()+"/outTEMP.cub";
+21 −21
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ using namespace Isis;

static QString APP_XML = FileName("$ISISROOT/bin/xml/apollofindrx.xml").expanded();

TEST_F(LargeCube, FunctionalTestApolloFindRxDefault) {
TEST_F(LargeCube, FunctionalTestApollofindrxDefault) {

  PvlGroup reseaus("Reseaus");
  PvlKeyword samples = PvlKeyword("Sample", "200");
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ using namespace Isis;

static QString APP_XML = FileName("$ISISROOT/bin/xml/apollopanstitcher.xml").expanded();

TEST_F(TempTestingFiles, FunctionalTestsApolloPanStitcherDefault) {
TEST_F(TempTestingFiles, FunctionalTestApollopanstitcherDefault) {
  QVector<QString> args = {"file_base=$ISISTESTDATA/isis/src/apollo/apps/apollopanstitcher/tsts/default/input/AS15_P_0177R10",
                           "to=" + tempDir.path() + "/reduced8.cub",
                           "microns=50"};
+74 −74
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ using namespace Isis;

static QString APP_XML = FileName("$ISISROOT/bin/xml/bandnorm.xml").expanded();

TEST_F(SmallCube, FunctionalTestsBandNormDefault) {
TEST_F(SmallCube, FunctionalTestBandnormDefault) {
  QString outCubeFileName = tempDir.path()+"/outTEMP.cub";

  // force all bands to be normalized to 1's
@@ -48,7 +48,7 @@ TEST_F(SmallCube, FunctionalTestsBandNormDefault) {
}


TEST_F(SmallCube, FunctionalTestsBandNormPencil) {
TEST_F(SmallCube, FunctionalTestBandnormPencil) {
  QString outCubeFileName = tempDir.path()+"/outTEMP.cub";
  QString pencilPath = "/tmp/pencil.txt";

@@ -136,7 +136,7 @@ TEST_F(SmallCube, FunctionalTestsBandNormPencil) {
}


TEST_F(SmallCube, FunctionalTestsBandNormByNumber) {
TEST_F(SmallCube, FunctionalTestBandnormByNumber) {
  QString outCubeFileName = tempDir.path()+"/outTEMP.cub";
  QString pencilPath = "/tmp/pencil.txt";

@@ -182,7 +182,7 @@ TEST_F(SmallCube, FunctionalTestsBandNormByNumber) {
}


TEST_F(SmallCube, FunctionalTestsBandNormByBandAvg) {
TEST_F(SmallCube, FunctionalTestBandnormByBandAvg) {
  QString outCubeFileName = tempDir.path()+"/outTEMP.cub";
  QString pencilPath = "/tmp/pencil.txt";

@@ -212,7 +212,7 @@ TEST_F(SmallCube, FunctionalTestsBandNormByBandAvg) {
}


TEST_F(SmallCube, FunctionalTestsBandNormByCubeAvg) {
TEST_F(SmallCube, FunctionalTestBandnormByCubeAvg) {
  QString outCubeFileName = tempDir.path()+"/outTEMP.cub";
  QString pencilPath = "/tmp/pencil.txt";

+1 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ using ::testing::AtLeast;

static QString APP_XML = FileName("$ISISROOT/bin/xml/cam2cam.xml").expanded();

TEST_F(DefaultCube, FunctionalTestCam2CamNoChange) {
TEST_F(DefaultCube, FunctionalTestCam2camNoChange) {

  QVector<QString> args = {"to="+tempDir.path()+"/Cam2CamNoChange.cub", "INTERP=BILINEAR"};
  UserInterface ui(APP_XML, args);
@@ -49,5 +49,3 @@ TEST_F(DefaultCube, FunctionalTestCam2CamNoChange) {
  ASSERT_EQ(icubeInstrumentGroup.findKeyword("GainModeId"), ocubeInstrumentGroup.findKeyword("GainModeId"));
  ASSERT_EQ(icubeInstrumentGroup.findKeyword("OffsetModeId"), ocubeInstrumentGroup.findKeyword("OffsetModeId"));
}

Loading