Merged revision(s) 7595-7638 from branches/WTI-490: Merged revision(s) 7537-7594 from trunk ........ Initial commit of changes from kleijn: - Removed HandleUserCancellingImport: FileImporter should not decide on its own how to handle Canceled actions. Consequently removed the messages that are generated by these handles - Added logic to the importers: Cancelling is not possible when putting data on the data model. Action will always execute when it is in this stage - Added branching paths in the activity: Import() returns false when it has failed or is cancelled
Note: failing tests will be fixed in following commits
........ Fixed tests of the FileImporterBase and Activity: - Checks on the states are made for the 4 different paths of the Import: -- Import successful, canceled or not -- Import not successful, canceled or not - Moved logging from the activity to the importer - Added tests to assert mentioned behaviour
........ Fixed tests of the PipingSurfaceLinesCsvImporter: - Added test to verify behaviour when canceling at the two stages during the import - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base - Added resource value for the ImportActivity (missing file commit)
........ Fixed tests of the PipingSoilProfilesImporter: - Added test to verify behaviour when canceling at the three stages during the import - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base - Cleaned redundant brackets
........ Fixed tests of the StructuresImporter: - Added test to verify behaviour when canceling at the two stages during the import. Test regarding cancelling while Creating structures is missing - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base
Adjusted test in PipingSoilProfilesImporterTest - Changed initial value of the result to make clear that the value is set correctly
........ Fixed tests of the ProfilesImporters: - Added test to verify behaviour when canceling at the two stages during the import. Test regarding cancelling while Creating structures is missing - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base
- Removed obsolete Cancel call in the PipingSoilProfilesImporterTest
........ FileImporters should call Observers in case the import was successfull AND was cancelled at an uncancellable stage.
Note: test is missing to verify this behaviour
........ Fixed tests of the ProfilesImporters: - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base - Temporarily removed the Cancel tests, because the FeatureBasedMapDataImporter does not have a handle for NotifyProgress. Hence, Cancel method cannot be invoked when Import is running.
........ Fixed tests of the FailureMechanismSectionsImporter: - Added test to verify behaviour when canceling at the three stages during the import - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base
- Cleaned up tests in the StructuresImporterTest
........ Fixed tests of the ReferenceLineImporter: - Added test to verify behaviour when canceling at the two stages during the import - Reverted changes related to HandleUserCancellingImport: messages are written by the LogImportCanceledMessage and handled adequately by the base
Loading ...