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.

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

The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests #5348

Merged
merged 4 commits into from
Nov 30, 2023

Conversation

kledmundson
Copy link
Contributor

Description

The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests.

Related Issue

#5346

How Has This Been Validated?

ISIS make file tests have been replaced with the following gtests.

FunctionalTestCneteditCheckValid
FunctionalTestCneteditCheckValidIgnoreAll
FunctionalTestCneteditDefault
FunctionalTestCneteditEditlock
FunctionalTestCneteditEditUnlock
FunctionalTestCneteditError
CneteditIgnore
CneteditIgnoreMeasuresPoints
CneteditIgnorePoints
CneteditIgnoreAllPoints
CneteditNoDelete
CneteditPreservePoints
CneteditMeasureListGeneral
CneteditMeasureListIgnoreAll
CneteditMeasureListDelete

Results of ctest suite...

ctest -R Cnetedit --output-on-failure
Test project /Users/kledmundson/ISISDev/cnetedit/Oct242023cne/ISIS3/build
Start 1790: CneteditCheckValid.FunctionalTestCneteditCheckValid
1/15 Test #1790: CneteditCheckValid.FunctionalTestCneteditCheckValid ............ Passed 4.84 sec
Start 1791: CneteditCheckValid.FunctionalTestCneteditCheckValidIgnoreAll
2/15 Test #1791: CneteditCheckValid.FunctionalTestCneteditCheckValidIgnoreAll ... Passed 4.45 sec
Start 1792: Cnetedit.FunctionalTestCneteditDefault
3/15 Test #1792: Cnetedit.FunctionalTestCneteditDefault ......................... Passed 0.71 sec
Start 1793: Cnetedit.FunctionalTestCneteditEditlock
4/15 Test #1793: Cnetedit.FunctionalTestCneteditEditlock ........................ Passed 0.75 sec
Start 1794: Cnetedit.FunctionalTestCneteditEditUnlock
5/15 Test #1794: Cnetedit.FunctionalTestCneteditEditUnlock ...................... Passed 0.75 sec
Start 1795: Cnetedit.FunctionalTestCneteditError
6/15 Test #1795: Cnetedit.FunctionalTestCneteditError ........................... Passed 0.50 sec
Start 1796: Cnetedit.CneteditIgnore
7/15 Test #1796: Cnetedit.CneteditIgnore ........................................ Passed 0.78 sec
Start 1797: Cnetedit.CneteditIgnoreMeasuresPoints
8/15 Test #1797: Cnetedit.CneteditIgnoreMeasuresPoints .......................... Passed 0.76 sec
Start 1798: Cnetedit.CneteditIgnorePoints
9/15 Test #1798: Cnetedit.CneteditIgnorePoints .................................. Passed 0.72 sec
Start 1799: Cnetedit.CneteditIgnoreAllPoints
10/15 Test #1799: Cnetedit.CneteditIgnoreAllPoints ............................... Passed 0.76 sec
Start 1800: Cnetedit.CneteditNoDelete
11/15 Test #1800: Cnetedit.CneteditNoDelete ...................................... Passed 1.14 sec
Start 1801: Cnetedit.CneteditPreservePoints
12/15 Test #1801: Cnetedit.CneteditPreservePoints ................................ Passed 0.77 sec
Start 1802: CneteditMeasureList.CneteditMeasureListGeneral
13/15 Test #1802: CneteditMeasureList.CneteditMeasureListGeneral ................. Passed 0.83 sec
Start 1803: CneteditMeasureList.CneteditMeasureListIgnoreAll
14/15 Test #1803: CneteditMeasureList.CneteditMeasureListIgnoreAll ............... Passed 0.85 sec
Start 1804: CneteditMeasureList.CneteditMeasureListDelete
15/15 Test #1804: CneteditMeasureList.CneteditMeasureListDelete .................. Passed 0.82 sec

100% tests passed, 0 tests failed out of 15

Total Test time (real) = 19.63 sec

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • [X ] Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have added myself to the .zenodo.json document.
  • I have added any user impacting changes to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@Kelvinrr
Copy link
Collaborator

Seems like a dup of #5323? I guess tests were missed?

@kledmundson
Copy link
Contributor Author

kledmundson commented Nov 28, 2023 via email

@Kelvinrr
Copy link
Collaborator

@kledmundson lmao no I can't read apparently. you are correct.

@acpaquette
Copy link
Collaborator

All Jenkins tests pass, should be good to merge

Copy link
Collaborator

@Kelvinrr Kelvinrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

initial look, still going through tests but it looks good overall.

isis/src/control/apps/cnetedit/cnetedit.cpp Outdated Show resolved Hide resolved
isis/src/control/apps/cnetedit/cnetedit.cpp Show resolved Hide resolved
isis/tests/FunctionalTestsCnetedit.cpp Outdated Show resolved Hide resolved
… cnetedit.cpp to avoid issues when linking libisis. Addresses DOI-USGS#5346.
@Kelvinrr Kelvinrr merged commit 36051ea into DOI-USGS:dev Nov 30, 2023
@kledmundson kledmundson deleted the update/cnetedit-appTests branch December 5, 2023 09:12
AustinSanders added a commit that referenced this pull request Dec 6, 2023
* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356)

* Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354.

* Updated CHANGELOG.md. Addresses #5354.

* Minor change to cnetthinner.xml. Addresses #5354.

* Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format. Fixes #3621. (#5175)

* Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format

* Updated CHANGELOG

* Dawn Target Translation Fix (#5294)

* Fixes dawn target translation for CERES images

* Added Changelog entry

* CSM Camera Qview Try Catches (#5295)

* Fix errors when using CSM camera in qview

* Added Changelog entry

* Fixes CSV parsing in shadowtau (#5316)

* Fixes CSV parsing in shadowtau

* Addressed PR feedback

* Error Report Fix for Program Launcher (#5331)

* Removed line that gets class, it is derived from the code

* Added more detailed error around itime not finding the leapsecond kernel

* Added changelog entry

* Updated trimfilter to correctly use high/low filters (#5340)

* Added high/low filters to trimfilter

* Updated changelog

* Updated changelog

---------

Co-authored-by: acpaquette <acpaquette@usgs.gov>

* corrected calibration inclusion filter (needed ,) (#5357)

* corrected calibration inclusion filter (needed ,)

* changelog entry downloadIsisData fix

* Updated changelog

* Updated changelog

* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356)

* Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354.

* Updated CHANGELOG.md. Addresses #5354.

* Minor change to cnetthinner.xml. Addresses #5354.

* The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests (#5348)

* The cnetedit application has been refactored to be callable; Makefile tests have been migrated to gtest format. Addresses #5346.

* Removed extraneous variables from FunctionalTestsCnetedit.cpp. Addresses #5346.

* Updated gtests; replace cubes with labels. Addresses #5346.

* Per review cleaned up sloppy spacing; made global variables static in cnetedit.cpp to avoid issues when linking libisis. Addresses #5346.

* The cnetdiff application has been refactored to be callable; Makefile tests have been removed and replaced by gtests. (#5323)

* The cnetedit applciation has been refactored to be callable; Makefile tests have been removed and replace by gtests. Addresses #5322.

* Moved CHANGELOG.md entry for cnetdiff changes from "Added" section to "Changed" section per reviewer suggestion. Addresses #5322.

* Reverted back to original ControlNetDiff source and header files per reviewer suggestion. Addresses #5322.

* Changes to cnetdiff.cpp and main.cpp to use the addLogGroup method to add PvlGroups to Pvl. Per reviewer suggestion. Addresses #5322.

* Put back line erroneously removed in CHANGELOG.md, per review. Addresses #5322.

* Version ticks

* Updated changelog

* Updated changelog

---------

Co-authored-by: kledmundson <6842706+kledmundson@users.noreply.github.com>
Co-authored-by: Christine Kim <125395064+chkim-usgs@users.noreply.github.com>
Co-authored-by: acpaquette <acpaquette@usgs.gov>
Co-authored-by: Jacob Cain <115182890+jrcain-usgs@users.noreply.github.com>
acpaquette added a commit to acpaquette/ISIS3 that referenced this pull request Mar 29, 2024
* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (DOI-USGS#5356)

* Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses DOI-USGS#5354.

* Updated CHANGELOG.md. Addresses DOI-USGS#5354.

* Minor change to cnetthinner.xml. Addresses DOI-USGS#5354.

* Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format. Fixes DOI-USGS#3621. (DOI-USGS#5175)

* Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format

* Updated CHANGELOG

* Dawn Target Translation Fix (DOI-USGS#5294)

* Fixes dawn target translation for CERES images

* Added Changelog entry

* CSM Camera Qview Try Catches (DOI-USGS#5295)

* Fix errors when using CSM camera in qview

* Added Changelog entry

* Fixes CSV parsing in shadowtau (DOI-USGS#5316)

* Fixes CSV parsing in shadowtau

* Addressed PR feedback

* Error Report Fix for Program Launcher (DOI-USGS#5331)

* Removed line that gets class, it is derived from the code

* Added more detailed error around itime not finding the leapsecond kernel

* Added changelog entry

* Updated trimfilter to correctly use high/low filters (DOI-USGS#5340)

* Added high/low filters to trimfilter

* Updated changelog

* Updated changelog

---------

Co-authored-by: acpaquette <acpaquette@usgs.gov>

* corrected calibration inclusion filter (needed ,) (DOI-USGS#5357)

* corrected calibration inclusion filter (needed ,)

* changelog entry downloadIsisData fix

* Updated changelog

* Updated changelog

* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (DOI-USGS#5356)

* Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses DOI-USGS#5354.

* Updated CHANGELOG.md. Addresses DOI-USGS#5354.

* Minor change to cnetthinner.xml. Addresses DOI-USGS#5354.

* The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests (DOI-USGS#5348)

* The cnetedit application has been refactored to be callable; Makefile tests have been migrated to gtest format. Addresses DOI-USGS#5346.

* Removed extraneous variables from FunctionalTestsCnetedit.cpp. Addresses DOI-USGS#5346.

* Updated gtests; replace cubes with labels. Addresses DOI-USGS#5346.

* Per review cleaned up sloppy spacing; made global variables static in cnetedit.cpp to avoid issues when linking libisis. Addresses DOI-USGS#5346.

* The cnetdiff application has been refactored to be callable; Makefile tests have been removed and replaced by gtests. (DOI-USGS#5323)

* The cnetedit applciation has been refactored to be callable; Makefile tests have been removed and replace by gtests. Addresses DOI-USGS#5322.

* Moved CHANGELOG.md entry for cnetdiff changes from "Added" section to "Changed" section per reviewer suggestion. Addresses DOI-USGS#5322.

* Reverted back to original ControlNetDiff source and header files per reviewer suggestion. Addresses DOI-USGS#5322.

* Changes to cnetdiff.cpp and main.cpp to use the addLogGroup method to add PvlGroups to Pvl. Per reviewer suggestion. Addresses DOI-USGS#5322.

* Put back line erroneously removed in CHANGELOG.md, per review. Addresses DOI-USGS#5322.

* Version ticks

* Updated changelog

* Updated changelog

---------

Co-authored-by: kledmundson <6842706+kledmundson@users.noreply.github.com>
Co-authored-by: Christine Kim <125395064+chkim-usgs@users.noreply.github.com>
Co-authored-by: acpaquette <acpaquette@usgs.gov>
Co-authored-by: Jacob Cain <115182890+jrcain-usgs@users.noreply.github.com>
acpaquette added a commit that referenced this pull request Mar 29, 2024
* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356)

* Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354.

* Updated CHANGELOG.md. Addresses #5354.

* Minor change to cnetthinner.xml. Addresses #5354.

* Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format. Fixes #3621. (#5175)

* Update photomet's MinnaertEmpirical model to handle PVL input in photemplate format

* Updated CHANGELOG

* Dawn Target Translation Fix (#5294)

* Fixes dawn target translation for CERES images

* Added Changelog entry

* CSM Camera Qview Try Catches (#5295)

* Fix errors when using CSM camera in qview

* Added Changelog entry

* Fixes CSV parsing in shadowtau (#5316)

* Fixes CSV parsing in shadowtau

* Addressed PR feedback

* Error Report Fix for Program Launcher (#5331)

* Removed line that gets class, it is derived from the code

* Added more detailed error around itime not finding the leapsecond kernel

* Added changelog entry

* Updated trimfilter to correctly use high/low filters (#5340)

* Added high/low filters to trimfilter

* Updated changelog

* Updated changelog

---------

Co-authored-by: acpaquette <acpaquette@usgs.gov>

* corrected calibration inclusion filter (needed ,) (#5357)

* corrected calibration inclusion filter (needed ,)

* changelog entry downloadIsisData fix

* Updated changelog

* Updated changelog

* Cnetthinner application bug fix resolving divide by zero in CnetManager.cpp. (#5356)

* Bug fix for a divide by zero in CnetManager.cpp. Additionally, the cnetthinner app has been converted to a callable function and Makefile tests converted to gtests. Addresses #5354.

* Updated CHANGELOG.md. Addresses #5354.

* Minor change to cnetthinner.xml. Addresses #5354.

* The cnetedit application has been refactored to be callable; Makefile tests have been removed and replaced by gtests (#5348)

* The cnetedit application has been refactored to be callable; Makefile tests have been migrated to gtest format. Addresses #5346.

* Removed extraneous variables from FunctionalTestsCnetedit.cpp. Addresses #5346.

* Updated gtests; replace cubes with labels. Addresses #5346.

* Per review cleaned up sloppy spacing; made global variables static in cnetedit.cpp to avoid issues when linking libisis. Addresses #5346.

* The cnetdiff application has been refactored to be callable; Makefile tests have been removed and replaced by gtests. (#5323)

* The cnetedit applciation has been refactored to be callable; Makefile tests have been removed and replace by gtests. Addresses #5322.

* Moved CHANGELOG.md entry for cnetdiff changes from "Added" section to "Changed" section per reviewer suggestion. Addresses #5322.

* Reverted back to original ControlNetDiff source and header files per reviewer suggestion. Addresses #5322.

* Changes to cnetdiff.cpp and main.cpp to use the addLogGroup method to add PvlGroups to Pvl. Per reviewer suggestion. Addresses #5322.

* Put back line erroneously removed in CHANGELOG.md, per review. Addresses #5322.

* Version ticks

* Updated changelog

* Updated changelog

---------

Co-authored-by: kledmundson <6842706+kledmundson@users.noreply.github.com>
Co-authored-by: Christine Kim <125395064+chkim-usgs@users.noreply.github.com>
Co-authored-by: acpaquette <acpaquette@usgs.gov>
Co-authored-by: Jacob Cain <115182890+jrcain-usgs@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants