Changeset 15981 in josm for trunk/test/unit
- Timestamp:
- 2020-03-01T23:35:51+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
r15979 r15981 16 16 import java.util.Set; 17 17 18 import org.junit.Before; 18 19 import org.junit.Rule; 19 20 import org.junit.Test; … … 28 29 import org.openstreetmap.josm.data.osm.OsmPrimitive; 29 30 import org.openstreetmap.josm.data.osm.OsmUtils; 31 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry; 32 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper; 30 33 import org.openstreetmap.josm.data.validation.Severity; 31 34 import org.openstreetmap.josm.data.validation.TestError; … … 53 56 public JOSMTestRules test = new JOSMTestRules().projection().territories().preferences(); 54 57 58 /** 59 * Setup test. 60 */ 61 @Before 62 public void setUp() { 63 MapCSSTagCheckerAsserts.clear(); 64 } 65 55 66 static MapCSSTagChecker buildTagChecker(String css) throws ParseException { 56 67 final MapCSSTagChecker test = new MapCSSTagChecker(); 57 test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css)).parseChecks); 68 Set<String> errors = new HashSet<>(); 69 test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css), "", errors::add).parseChecks); 70 assertTrue(errors.toString(), errors.isEmpty()); 58 71 return test; 59 72 } … … 182 195 MapCSSTagChecker c = new MapCSSTagChecker(); 183 196 c.initialize(); 184 197 } 198 199 /** 200 * Unit test for all {@link MapCSSTagChecker.TagTest} assertions. 201 * @throws Exception if an error occurs 202 */ 203 @Test 204 public void testAssertions() throws Exception { 205 MapCSSTagChecker c = new MapCSSTagChecker(); 185 206 Set<String> assertionErrors = new LinkedHashSet<>(); 186 for (Set<TagCheck> schecks : c.checks.values()) { 187 assertionErrors.addAll(MapCSSTagCheckerAsserts.checkAsserts(schecks)); 188 } 207 208 // initialize 209 for (ExtendedSourceEntry entry : ValidatorPrefHelper.INSTANCE.getDefault()) { 210 c.addMapCSS(entry.url, assertionErrors::add); 211 } 212 189 213 for (String msg : assertionErrors) { 190 214 Logging.error(msg); … … 205 229 " assertNoMatch: \"node amenity=restaurant\";\n" + 206 230 "}"); 207 Set<String> errors = MapCSSTagCheckerAsserts.checkAsserts(test.checks.get("test")); 208 assertTrue(errors.toString(), errors.isEmpty()); 231 assertNotNull(test); 209 232 } 210 233 … … 221 244 " assertNoMatch: \"way name=Hauptstrasse\";\n" + 222 245 "}"); 223 Set<String> errors = MapCSSTagCheckerAsserts.checkAsserts(test.checks.get("test")); 224 assertTrue(errors.toString(), errors.isEmpty()); 246 assertNotNull(test); 225 247 } 226 248
Note:
See TracChangeset
for help on using the changeset viewer.