Index: trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (revision 13322)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (revision 13325)
@@ -6,5 +6,4 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.lang.reflect.Field;
@@ -409,13 +408,11 @@
/**
* Compiles "foo type bar" and tests the parse error message
- */
- @Test
- public void testFooTypeBar() {
- try {
- SearchCompiler.compile("foo type bar");
- fail();
- } catch (SearchParseError parseError) {
- assertEquals("Expecting : after type", parseError.getMessage());
- }
+ * @throws SearchParseError always
+ */
+ @Test
+ public void testFooTypeBar() throws SearchParseError {
+ expectedEx.expect(SearchParseError.class);
+ expectedEx.expectMessage("Expecting : after type");
+ SearchCompiler.compile("foo type bar");
}
@@ -693,14 +690,3 @@
}
}
-
- /**
- * Non-regression test for Bug #15755.
- * @throws SearchParseError always
- */
- @Test
- public void testTicket15755() throws SearchParseError {
- expectedEx.expect(SearchParseError.class);
- expectedEx.expectMessage("Expecting : after type");
- SearchCompiler.compile("public_transport=stop_area -type");
- }
}