Changeset 12851 in josm for trunk/test
- Timestamp:
- 2017-09-14T01:59:34+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java
r10945 r12851 12 12 import org.junit.Rule; 13 13 import org.junit.Test; 14 import org.openstreetmap.josm.data. Preferences;14 import org.openstreetmap.josm.data.StructUtils; 15 15 import org.openstreetmap.josm.testutils.JOSMTestRules; 16 16 import org.openstreetmap.josm.tools.MultiMap; … … 56 56 57 57 /** 58 * Tests the {@linkplain Preferences#serializeStruct(Object, Class) serialization} of {@link ImageryInfo.ImageryPreferenceEntry}58 * Tests the {@linkplain StructUtils#serializeStruct(Object, Class) serialization} of {@link ImageryInfo.ImageryPreferenceEntry} 59 59 */ 60 60 @Test … … 64 64 info.noTileHeaders.put("ETag", "foo"); 65 65 info.noTileHeaders.put("ETag", "bar"); 66 final Map<String, String> map = Preferences.serializeStruct(info, ImageryInfo.ImageryPreferenceEntry.class);66 final Map<String, String> map = StructUtils.serializeStruct(info, ImageryInfo.ImageryPreferenceEntry.class); 67 67 assertEquals("{noTileHeaders={\"ETag\":[\"foo\",\"bar\"]}}", map.toString()); 68 68 } 69 69 70 70 /** 71 * Tests the {@linkplain Preferences#deserializeStruct(Map, Class)} deserialization} of {@link ImageryInfo.ImageryPreferenceEntry}71 * Tests the {@linkplain StructUtils#deserializeStruct(Map, Class)} deserialization} of {@link ImageryInfo.ImageryPreferenceEntry} 72 72 */ 73 73 @Test 74 74 public void testDeserializeStruct() { 75 final ImageryInfo.ImageryPreferenceEntry info = Preferences.deserializeStruct(75 final ImageryInfo.ImageryPreferenceEntry info = StructUtils.deserializeStruct( 76 76 Collections.singletonMap("noTileHeaders", "{\"ETag\":[\"foo\",\"bar\"]}"), ImageryInfo.ImageryPreferenceEntry.class); 77 77 MultiMap<String, String> expect = new MultiMap<>(); … … 84 84 85 85 /** 86 * Tests the {@linkplain Preferences#deserializeStruct(Map, Class)} deserialization} of legacy {@link ImageryInfo.ImageryPreferenceEntry}86 * Tests the {@linkplain StructUtils#deserializeStruct(Map, Class)} deserialization} of legacy {@link ImageryInfo.ImageryPreferenceEntry} 87 87 */ 88 88 @Test 89 89 public void testDeserializeStructTicket12474() { 90 final ImageryInfo.ImageryPreferenceEntry info = Preferences.deserializeStruct(90 final ImageryInfo.ImageryPreferenceEntry info = StructUtils.deserializeStruct( 91 91 Collections.singletonMap("noTileHeaders", "{\"ETag\":\"foo-and-bar\"}"), ImageryInfo.ImageryPreferenceEntry.class); 92 92 final Set<String> eTag = info.noTileHeaders.get("ETag");
Note:
See TracChangeset
for help on using the changeset viewer.