-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Raised an issue to propose your change (https://github.com/cvat-ai/cvat/issues). It helps to avoid duplication of efforts from multiple independent contributors. Discuss your ideas with maintainers to be sure that changes will be approved and merged. Read the [CONTRIBUTION](https://github.com/cvat-ai/cvat/blob/develop/CONTRIBUTING.md) guide. --> <!-- Provide a general summary of your changes in the Title above --> ### Motivation and context <!-- Why is this change required? What problem does it solve? If it fixes an open issue, please link to the issue here. Describe your changes in detail, add screenshots. --> Resolved #5274 + Fixed typo in tests ### How has this been tested? <!-- Please describe in detail how you tested your changes. Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc. --> ### Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. If an item isn't applicable by a reason then ~~explicitly strikethrough~~ the whole line. If you don't do that github will show an incorrect process for the pull request. If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] I submit my changes into the `develop` branch - [x] I have added a description of my changes into [CHANGELOG](https://github.com/cvat-ai/cvat/blob/develop/CHANGELOG.md) file - [ ] I have updated the [documentation]( https://github.com/cvat-ai/cvat/blob/develop/README.md#documentation) accordingly - [x] I have added tests to cover my changes - [x] I have linked related issues ([read github docs]( https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) - [x] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning), [cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning)) ### License - [x] I submit _my code changes_ under the same [MIT License]( https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the project. Feel free to contact the maintainers if that's a concern.
- Loading branch information
Showing
18 changed files
with
135 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...s/cypress/integration/issues_prs2/issue_5274_upload_annotations_different_file_formats.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Copyright (C) 2022 CVAT.ai Corporation | ||
| // | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| /// <reference types="cypress" /> | ||
|
|
||
| import { taskName, labelName } from '../../support/const'; | ||
|
|
||
| context('Upload annotations in different file formats', () => { | ||
| const issueId = '5274'; | ||
| const createRectangleTrack2Points = { | ||
| points: 'By 2 Points', | ||
| type: 'Track', | ||
| labelName, | ||
| firstX: 250, | ||
| firstY: 350, | ||
| secondX: 350, | ||
| secondY: 450, | ||
| }; | ||
|
|
||
| const archives = [ | ||
| { | ||
| type: 'annotations', | ||
| format: 'CVAT for images', | ||
| archiveCustomName: 'issue5274-cvat-for-images', | ||
| annotationsPath: 'annotations.xml', | ||
| }, | ||
| { | ||
| type: 'annotations', | ||
| format: 'COCO', | ||
| archiveCustomName: 'issue5274-coco', | ||
| annotationsPath: 'annotations/instances_default.json', | ||
| }, | ||
| ]; | ||
|
|
||
| before(() => { | ||
| cy.openTaskJob(taskName); | ||
| cy.createRectangle(createRectangleTrack2Points); | ||
| cy.saveJob('PATCH', 200, 'saveJobDump'); | ||
| for (const archive of archives) { | ||
| cy.exportJob(archive); | ||
| cy.waitForDownload(); | ||
| cy.unpackZipArchive(`cypress/fixtures/${archive.archiveCustomName}.zip`, archive.archiveCustomName); | ||
| } | ||
| }); | ||
|
|
||
| describe(`Testing issue "${issueId}"`, () => { | ||
| it('Dump annotations. Upload different file formats.', () => { | ||
| cy.removeAnnotations(); | ||
| cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); | ||
| for (const archive of archives) { | ||
| cy.interactMenu('Upload annotations'); | ||
| cy.uploadAnnotations( | ||
| archive.format.split(' ')[0], | ||
| `${archive.archiveCustomName}/${archive.annotationsPath}`, | ||
| '.cvat-modal-content-load-job-annotation', | ||
| ); | ||
|
|
||
| cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); | ||
| cy.get('#cvat_canvas_shape_1').should('exist'); | ||
| cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); | ||
|
|
||
| cy.removeAnnotations(); | ||
| } | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
tests/cypress/plugins/unpackZipArchive/unpackZipArchiveCommand.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| // Copyright (C) 2021-2022 Intel Corporation | ||
| // Copyright (C) 2022 CVAT.ai Corporation | ||
| // | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| Cypress.Commands.add('unpackZipArchive', (arhivePath) => cy.task('unpackZipArchive', { | ||
| Cypress.Commands.add('unpackZipArchive', (arhivePath, extractPath) => cy.task('unpackZipArchive', { | ||
| arhivePath, | ||
| extractPath, | ||
| })); |
Oops, something went wrong.