Wykres commitów

184 Commity (4ed09dd7e17bc3c33c57d15a7d78bf0a4bae7d82)

Autor SHA1 Wiadomość Data
Taylor Smock 3b94fe1150
Fix an NPE in a test
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-14 10:19:10 -06:00
Taylor Smock 5d81c2906f
Fix some compile warnings
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-14 08:53:02 -06:00
Taylor Smock 5d35fb36f3
FIXUP: Avoid crash when user may have modified conn/dupe tags
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-13 15:10:07 -06:00
Taylor Smock 2c8c3adef2
Fix JOSM-19473
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-07-01 10:55:46 -06:00
Taylor Smock 6f3aef98c3
Fix some issues when tests were run together
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 15:44:14 -06:00
Taylor Smock 11adb96777
Add basic tests for the MapWithAIMenu
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 15:03:46 -06:00
Taylor Smock c042ce8df4
Add a test for MapWithAIDefaultLayerTableModel
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 14:06:55 -06:00
Taylor Smock 6ec23bb0a9
Basic testing for AddMapWithAILayerAction + a fix for an NPE
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 13:15:07 -06:00
Taylor Smock 81950d379e
Add basic test for MapWithAIProvidersPanel
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 10:51:53 -06:00
Taylor Smock e336dedb42
Default continuous download to on
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 10:51:53 -06:00
Taylor Smock 1414061c23
Create a dynamic menu that shows sources in the current view
This fixes #88.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 09:45:22 -06:00
Taylor Smock 786ee5f689
Ensure that we only try to convert to tags when an equals sign is present.
This fixes #90.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-30 08:27:58 -06:00
Taylor Smock 59f6ee8671
FIXUP: Test needed to be corrected for adding the MapWithAI preferences to the data menu
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-29 16:57:51 -06:00
Taylor Smock f36f362d26
More testing for MapWithAIDownloadSourceType
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-25 11:01:53 -06:00
Taylor Smock 60e3d8f74a
Fix a URL so that it catches other URL patterns
Also, make some modifications to rules so that a mocker can be used for
some classes, to reduce time running tests

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 15:58:16 -06:00
Taylor Smock 3565fcb232
Wiremock conflation servers
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 15:17:24 -06:00
Taylor Smock 5b4d06b96a
Ensure that MapWithAILayerInfo is always called when test rules set it up
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 15:00:33 -06:00
Taylor Smock 69d69e8df3
Add a wiremock response transformer
This ensures that any URL's in the response are also mocked (or fails
the test).

I also fixed a listener bug for MapWithAILayerInfo.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 14:00:56 -06:00
Taylor Smock ab34c3843e
Actually use wiremock for some tests (url's weren't always being reset)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 14:00:56 -06:00
Taylor Smock 35768d1997
Make MapWithAILayerInfo.instance private
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-24 14:00:51 -06:00
Taylor Smock b07707cc22
FIXUP: Ensure that we don't try to merge deleted ways
This fixes #81.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 13:50:19 -06:00
Taylor Smock 8e46ca2a65
Add test for #79. Currently only fails when run with other tests.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-22 11:44:39 -06:00
Taylor Smock 43510ce15e
Properly clean up plugin initialization in test code
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-16 08:53:45 -06:00
Taylor Smock b6b90b2d05
FIXUP: Actually set the original release URL
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-15 17:20:12 -06:00
Taylor Smock a54e21a1c9
Add methods to hide already conflated data
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-12 09:04:19 -06:00
Taylor Smock d64aed9270
Various documentation fixes and Entry -> Map.Entry
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-11 14:21:50 -06:00
Taylor Smock cde1e3f60a
Split some classes into their own files and fix some sonarlint issues.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 16:31:44 -06:00
Taylor Smock 281736e0ec
Remove MapWithAIDownloadReader
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-10 11:06:50 -06:00
Taylor Smock b2ffe175ca
Change how test waits for completion of background task
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-09 12:55:39 -06:00
Taylor Smock 978c175d26
Modify wiremock mappings so they are less sensitive to parameter changes.
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-04 16:24:51 -06:00
Taylor Smock 60b99acef9
Extract ESRI server reader to separate file
* Also add source provider information
* Update pjson -> json (the latter is slightly more efficient)

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 17:07:47 -06:00
Taylor Smock 21d5c6b477
Spotbugs, errorprone fixes
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock 222c4bb12b
Add tests for parsing esri feature servers
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock 1277c00ee1
Use assertThrows instead of ExpectedException
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:01 -06:00
Taylor Smock b01b89e0d5
Add tests for MapWithAIInfo and MapWithAISourceReader
There is now an integration test directory, which is specifically for
any tests that may call an exterior server (i.e., mapwith.ai).

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:32:00 -06:00
Taylor Smock 25c378ea34
Add WindowMockers (now required due to a dependency from MapWithAIDownloadOptions)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:56 -06:00
Taylor Smock 46ff076402
Modify test so that it only counts paint styles with MapWithAI in the title (name)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:53 -06:00
Taylor Smock 67f408476a
Fix a test that has issues if other tests have added urls
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:52 -06:00
Taylor Smock d7fe108f1f
Initial implementation for setting sources in download
* Add checkbox to main UI download panel
  * For more information, see JOSM-18340
* There have been some modifications so that both JOSM UI panel download
  methods use the same class to download.
* Reuse panel from preferences for setting sources

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:48 -06:00
Taylor Smock 94414ea1b6
Move Download Window for MapWithAI to appropriate location
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:47 -06:00
Taylor Smock 9e48553b1d
More thorough testing for the upload hook
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:46 -06:00
Taylor Smock 0aa1672659
Add explicit test for the status line object feedback
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:45 -06:00
Taylor Smock 072a839e05
Ensure that we are only using wiremock mappings when a test uses wiremock
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-06-03 16:31:44 -06:00
Taylor Smock b23eef2302
Add method to remove empty keys/tags
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-20 13:57:46 -06:00
Taylor Smock c7422e7dcf
Better client-side conflation
Instead of performing missing conflation in a parallel code path, we now
add the appropriate tags prior to the rest of the conflation taking
place.

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-14 11:19:39 -06:00
Taylor Smock 3d43ee1434
Fix some tests, and ensure that they are reliably passing/failing (i.e., not due to a missing mock)
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-12 14:59:00 -06:00
Taylor Smock c3143a056a
Detect potential missing connection tags, and offer to add the appropriate connection
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-12 10:40:31 -06:00
Taylor Smock d52ba178f5
Try to detect when download area is too large (from server response), and try again
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-05-08 08:58:12 -06:00
Taylor Smock fd6f3c5087
Continuing to try to fix a broken test
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-23 08:58:06 -06:00
Taylor Smock 6ceae5095a
Work on investigating failing test
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
2020-04-22 17:35:32 -06:00