Ignore:
Timestamp:
2020-10-10T22:32:44+02:00 (4 years ago)
Author:
simon04
Message:

see #19370 - Fix GpxWriterTest, InspectPrimitiveDialogTest on Windows

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java

    r15560 r17149  
    22package org.openstreetmap.josm.io;
    33
    4 import static org.junit.Assert.assertEquals;
     4import static org.openstreetmap.josm.TestUtils.assertEqualsNewline;
    55
    66import java.awt.Color;
    77import java.io.ByteArrayOutputStream;
    88import java.io.IOException;
    9 import java.nio.charset.StandardCharsets;
    109import java.time.LocalDate;
    1110import java.time.Month;
    … …  
    5150            writer.write(gpx);
    5251        }
    53         assertEquals(String.format("<?xml version='1.0' encoding='UTF-8'?>%n" +
    54                 "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"%n" +
    55                 "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"%n" +
    56                 "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">%n" +
    57                 "  <metadata>%n" +
    58                 "    <bounds minlat=\"0.0\" minlon=\"0.0\" maxlat=\"0.0\" maxlon=\"0.0\"/>%n" +
    59                 "  </metadata>%n" +
    60                 "  <wpt lat=\"0.0\" lon=\"0.0\">%n" +
     52        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
     53                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
     54                "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
     55                "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\n" +
     56                "  <metadata>\n" +
     57                "    <bounds minlat=\"0.0\" minlon=\"0.0\" maxlat=\"0.0\" maxlon=\"0.0\"/>\n" +
     58                "  </metadata>\n" +
     59                "  <wpt lat=\"0.0\" lon=\"0.0\">\n" +
    6160                atts +
    62                 "  </wpt>%n" +
    63                 "</gpx>"), baos.toString(StandardCharsets.UTF_8.name()));
     61                "  </wpt>\n" +
     62                "</gpx>", baos.toString());
    6463    }
    6564
    … …  
    7372        testSingleWaypoint(
    7473                w -> w.put(GpxConstants.PT_TIME, Date.from(LocalDate.of(2018, Month.AUGUST, 2).atStartOfDay(ZoneOffset.UTC).toInstant())),
    75                 "    <time>2018-08-02T00:00:00Z</time>%n");
     74                "    <time>2018-08-02T00:00:00Z</time>\n");
    7675    }
    7776
    … …  
    9089                    w.put(GpxConstants.PT_PDOP, 1.2);
    9190                },
    92                 "    <sat>16</sat>%n" +
    93                 "    <hdop>0.7</hdop>%n" +
    94                 "    <vdop>0.9</vdop>%n" +
    95                 "    <pdop>1.2</pdop>%n");
     91                "    <sat>16</sat>\n" +
     92                "    <hdop>0.7</hdop>\n" +
     93                "    <vdop>0.9</vdop>\n" +
     94                "    <pdop>1.2</pdop>\n");
    9695    }
    9796
    … …  
    134133
    135134        writer.write(data);
    136         assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
     135        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
    137136                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
    138137                "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
    … …  
    171170        baos.reset();
    172171        writer.write(data, GpxConstants.ColorFormat.GPXX, true);
    173         assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
     172        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
    174173                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
    175174                "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
    … …  
    210209        baos.reset();
    211210        writer.write(data, null, false);
    212         assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
     211        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
    213212                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
    214213                "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
    … …  
    243242        // being hidden, even if they don't actually have to be converted
    244243        // (GPXD -> convertColor() -> GPXX -> hide() -> null -> show() -> GPXX)
    245         assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n" +
     244        assertEqualsNewline("<?xml version='1.0' encoding='UTF-8'?>\n" +
    246245                "<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
    247246                "    xmlns:knownprefix=\"http://example.com/URI\"\n" +
Note: See TracChangeset for help on using the changeset viewer.