Unverified Commit ee9445c6 authored by ihumphrey's avatar ihumphrey Committed by GitHub
Browse files

Merge pull request #344 from chrisryancombs/ipceBundleWindow_unitTestFix 

Changed  BundleSettings unit test truth data to reflect changes in class behavior.
parents 065b5746 e528bff8

isis/src/control/objs/BundleSettings/BundleSettings.cpp

+3 −5
Original line number Diff line number Diff line
@@ -435,17 +435,15 @@ namespace Isis { 




  /**

   * Retrieves solve settings for the observation corresponding to the given

   * observation number.

   * Retrieves solve settings for the observation corresponding to the given observation number. 

   * If no corresponding settings object exists, return a new solve settings with no related 

   * observation numbers.

   *

   * @param observationNumber The observation number associated with the

   *                          BundleObservationSolveSettings object to be accessed.

   *

   * @return @b BundleObservationSolveSettings The observation settings object that contains

   *                                           the observation number passed.

   *

   * @throw IException::Unknown "Unable to find BundleObservationSolveSettings

   *                             for given observation number"

   */

  BundleObservationSolveSettings

      BundleSettings::observationSolveSettings(QString observationNumber) const {

isis/src/control/objs/BundleSettings/BundleSettings.truth

+0 −1
Original line number Diff line number Diff line
@@ -434,7 +434,6 @@ Testing XML: Object deserialized as (should match object above): 




Testing error throws...

**ERROR** Unable to find BundleObservationSolveSettings for observation number [UnassociatedObservationNumber].

**ERROR** Unable to find BundleObservationSolveSettings with index = [32].

**ERROR** Unable to find BundleObservationSolveSettings with index = [-1].

**PROGRAMMER ERROR** Unknown bundle convergence criteria [Pickles].