From b77e8ddba0c460f422b1d9de7bdf276b063c51a8 Mon Sep 17 00:00:00 2001
From: Kristin <kberry@usgs.gov>
Date: Thu, 12 Mar 2020 14:54:29 -0700
Subject: [PATCH] Fix unit test failures associated with base data area update.
 (#3753)

* Fix missed ProcessImportPds base references and update CMakelists to move translation files from the ISIS3/isis/src/missionName/translations level

* Update classes and tests with base-area changes that were uncovered via CI tests failing
---
 isis/CMakeLists.txt                                        | 2 +-
 isis/src/base/objs/EmbreeTargetManager/unitTest.cpp        | 2 +-
 isis/src/base/objs/Histogram/unitTest.cpp                  | 2 +-
 isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h   | 2 +-
 isis/src/base/objs/XmlToPvlTranslationManager/unitTest.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt
index 67ea9a0a44..672f243142 100644
--- a/isis/CMakeLists.txt
+++ b/isis/CMakeLists.txt
@@ -519,7 +519,7 @@ add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
   ${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.trn  
   ${CMAKE_SOURCE_DIR}/appdata/translations/*.typ ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.typ
   ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn  ${CMAKE_SOURCE_DIR}/src/*/translations/*.trn
-  ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft
+  ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def
   ${CMAKE_BINARY_DIR}/appdata/translations)
 add_dependencies(isis3 appdata)
 
diff --git a/isis/src/base/objs/EmbreeTargetManager/unitTest.cpp b/isis/src/base/objs/EmbreeTargetManager/unitTest.cpp
index d88771c19a..46d4f66d76 100644
--- a/isis/src/base/objs/EmbreeTargetManager/unitTest.cpp
+++ b/isis/src/base/objs/EmbreeTargetManager/unitTest.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
     qDebug() << "";
 
     qDebug() << "Create a new target shape for the same file";
-    QString copyDSKFile = "$ISIS3DATA/base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds";
+    QString copyDSKFile = "$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds";
     EmbreeTargetShape *copyTargetShape = manager->create(copyDSKFile);
     qDebug() << "Target shape status:";
     qDebug() << "  Number of polygons: " << copyTargetShape->numberOfPolygons();
diff --git a/isis/src/base/objs/Histogram/unitTest.cpp b/isis/src/base/objs/Histogram/unitTest.cpp
index 2e6eb40023..992358debb 100644
--- a/isis/src/base/objs/Histogram/unitTest.cpp
+++ b/isis/src/base/objs/Histogram/unitTest.cpp
@@ -160,7 +160,7 @@ int main(int argc, char *argv[]) {
   Isis::Progress progress;
   Isis::FileName netName("$base/testData/enceladus_sp-Jig.net");
   flist.append(netName.expanded());
-  cout << netName.toString().replace(QRegularExpression("(\\/[\\w\\-\\. ]*)+\\/data"), "data").toStdString() << endl;
+  cout << netName.toString().replace(QRegularExpression("(\\/[\\w\\-\\. ]*)+\\/*data"), "data").toStdString() << endl;
 
   Isis::ControlNet net(flist[0], &progress);
 
diff --git a/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h b/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h
index d31c06a3e8..1831956bb7 100644
--- a/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h
+++ b/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h
@@ -120,7 +120,7 @@ namespace Isis {
       void setImageType(ImageType imageType);
       void setPixelDescription(QString description); 
       static void translateUnits(QDomDocument &label,
-                                 QString transMapFile = "$base/translations/pds4ExportUnits.pvl");
+                      QString transMapFile = "$ISISROOT/appdata/translations/pds4ExportUnits.pvl");
       void reorder();
       void addSchema(QString sch, QString xsd, QString xmlns, QString xmlnsURI);
       void addSchema(QString xsd, QString xmlns, QString xmlnsURI);
diff --git a/isis/src/base/objs/XmlToPvlTranslationManager/unitTest.cpp b/isis/src/base/objs/XmlToPvlTranslationManager/unitTest.cpp
index bf618d44a7..65dad76bf0 100644
--- a/isis/src/base/objs/XmlToPvlTranslationManager/unitTest.cpp
+++ b/isis/src/base/objs/XmlToPvlTranslationManager/unitTest.cpp
@@ -370,7 +370,7 @@ int main(void) {
     }
 
     try {
-      FileName pvlFile("$base/translations/pdsImage.trn");
+      FileName pvlFile("$ISISROOT/appdata/translations/pdsImage.trn");
       stringstream simpleTrans;
       simpleTrans << "Group = Version" << endl;
       simpleTrans << "  Auto" << endl;