Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed FunctionalTestGetsnAllTrue by creating non-static APP_XML #4022

Merged
merged 2 commits into from
Sep 17, 2020
Merged

Fixed FunctionalTestGetsnAllTrue by creating non-static APP_XML #4022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395f53c
Fixed FunctionalTestGetsnAllTrue by creating non-static APP_XML
Sep 17, 2020
784f9fa
Replaced static APP_XML with per-test instances
Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions isis/tests/FunctionalTestsGetsn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,20 @@

using namespace Isis;


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

// check for all correct outputs
TEST_F(DefaultCube, FunctionalTestGetsnAllTrue) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QString expectedSN = "Viking1/VISB/33322515";
QString expectedON = "Viking1/VISB/33322515";
QVector<QString> args = {
"FILE=TRUE",
QVector<QString> args = { "FILE=TRUE",
"SN=TRUE",
"OBSERVATION=TRUE"};
UserInterface options(APP_XML, args);
Pvl appLog;

getsn( testCube, options, &appLog );
PvlGroup results = appLog.findGroup("Results");
PvlGroup results = appLog.findGroup("Results");

EXPECT_PRED_FORMAT2(AssertQStringsEqual, results.findKeyword("Filename"), testCube->fileName());
EXPECT_PRED_FORMAT2(AssertQStringsEqual, results.findKeyword("SerialNumber"), expectedSN);
EXPECT_PRED_FORMAT2(AssertQStringsEqual, results.findKeyword("ObservationNumber"), expectedON);
Expand All @@ -44,6 +41,7 @@ TEST_F(DefaultCube, FunctionalTestGetsnAllTrue) {
// Set sn=false; so all output params are false
// resulting data should not contain any of the three output types
TEST_F(DefaultCube, FunctionalTestGetsnAllFalse) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QVector<QString> args = { "SN=FALSE" };
UserInterface options(APP_XML, args);
Pvl appLog;
Expand All @@ -60,15 +58,16 @@ TEST_F(DefaultCube, FunctionalTestGetsnAllFalse) {
// Test the param DEFAULT=TRUE
// when no SN can be generated, the SN should default to the file name
TEST_F(DefaultCube, FunctionalTestGetsnDefaultTrue) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QString fileName = "default.cub";
QVector<QString> args = { "DEFAULT=TRUE" };
UserInterface options(APP_XML, args);
Pvl appLog;
Pvl *testLabel = testCube->label();
testLabel->findObject( "IsisCube" ).deleteGroup( "Instrument" );

getsn( testCube, options, &appLog );
PvlGroup results = appLog.findGroup("Results");
PvlGroup results = appLog.findGroup("Results");

EXPECT_PRED_FORMAT2(AssertQStringsEqual, fileName , results.findKeyword("SerialNumber"));
}
Expand All @@ -77,22 +76,24 @@ TEST_F(DefaultCube, FunctionalTestGetsnDefaultTrue) {
// Test the param DEFAULT=FALSE
// when no SN can be generated, the SN should default to "Unknown"
TEST_F(DefaultCube, FunctionalTestGetsnDefaultFalse) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QString fileName = "Unknown";
QVector<QString> args = { "DEFAULT=FALSE" };
UserInterface options(APP_XML, args);
Pvl appLog;
Pvl *testLabel = testCube->label();
testLabel->findObject( "IsisCube" ).deleteGroup( "Instrument" );

getsn( testCube, options, &appLog );
PvlGroup results = appLog.findGroup("Results");
PvlGroup results = appLog.findGroup("Results");

EXPECT_PRED_FORMAT2(AssertQStringsEqual, fileName , results.findKeyword("SerialNumber"));
}


// Test flatfile mode gives expected output
TEST_F(DefaultCube, FunctionalTestGetsnFlat) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QString expectedSN = "Viking1/VISB/33322515";
QFile flatFile(tempDir.path()+"/testOut.txt");
QVector<QString> args = {
Expand All @@ -113,8 +114,9 @@ TEST_F(DefaultCube, FunctionalTestGetsnFlat) {

// Test that append true appends to file
TEST_F(DefaultCube, FunctionalTestGetsnAppend) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QFile flatFile(tempDir.path()+"testOut.txt");
QVector<QString> args = {
QVector<QString> args = {
"FORMAT=FLAT",
"TO="+flatFile.fileName(),
"APPEND=TRUE"};
Expand All @@ -132,8 +134,9 @@ TEST_F(DefaultCube, FunctionalTestGetsnAppend) {

// Test that append false overwrites file
TEST_F(DefaultCube, FunctionalTestGetsnOverwrite) {
QString APP_XML = FileName("$ISISROOT/bin/xml/getsn.xml").expanded();
QFile flatFile(tempDir.path()+"testOut.txt");
QVector<QString> args = {
QVector<QString> args = {
"FORMAT=FLAT",
"TO="+flatFile.fileName(),
"APPEND=FALSE"};
Expand Down