This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 750c735f43ee7e229687107c55a49251b584086c Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 10 13:22:19 2026 -0400 JUnit 5 migration of "cayenne-wocompat" module --- modeler/cayenne-wocompat/pom.xml | 7 +-- .../apache/cayenne/wocompat/EOModelHelperTest.java | 37 +++++++-------- .../wocompat/EOModelProcessorInheritanceTest.java | 18 ++++---- .../cayenne/wocompat/EOModelProcessorTest.java | 26 +++++------ .../cayenne/wocompat/EOModelPrototypesTest.java | 22 ++++----- .../org/apache/cayenne/wocompat/EOQueryTest.java | 21 +++++---- .../wocompat/PropertyListSerializationTest.java | 52 +++++++++++----------- .../wocompat/parser/PropertyListParserTest.java | 42 ++++++++--------- 8 files changed, 107 insertions(+), 118 deletions(-) diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml index 06b7e19fc..5c4aac7d8 100644 --- a/modeler/cayenne-wocompat/pom.xml +++ b/modeler/cayenne-wocompat/pom.xml @@ -46,12 +46,7 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> +<dependency> <groupId>org.apache.cayenne.build-tools</groupId> <artifactId>cayenne-test-utilities</artifactId> <version>${project.version}</version> diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java index ffebe705f..90f411f34 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java @@ -19,12 +19,12 @@ package org.apache.cayenne.wocompat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -34,14 +34,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class EOModelHelperTest { protected EOModelHelper helper; - @Before + @BeforeEach public void setUp() throws Exception { URL url = getClass().getClassLoader().getResource("wotests/art.eomodeld/"); assertNotNull(url); @@ -49,7 +49,7 @@ public class EOModelHelperTest { } @Test - public void testModelNames() throws Exception { + public void modelNames() throws Exception { Iterator names = helper.modelNames(); // collect to list and then analyze @@ -65,7 +65,7 @@ public class EOModelHelperTest { } @Test - public void testQueryNames() throws Exception { + public void queryNames() throws Exception { Iterator artistNames = helper.queryNames("Artist"); assertFalse(artistNames.hasNext()); @@ -84,7 +84,7 @@ public class EOModelHelperTest { } @Test - public void testQueryPListMap() throws Exception { + public void queryPListMap() throws Exception { assertNull(helper.queryPListMap("Artist", "AAA")); assertNull(helper.queryPListMap("ExhibitType", "AAA")); @@ -94,26 +94,21 @@ public class EOModelHelperTest { } @Test - public void testLoadQueryIndex() throws Exception { + public void loadQueryIndex() throws Exception { Map index = helper.loadQueryIndex("ExhibitType"); assertNotNull(index); assertTrue(index.containsKey("FetchAll")); } @Test - public void testOpenQueryStream() throws Exception { + public void openQueryStream() throws Exception { try (InputStream in = helper.openQueryStream("ExhibitType");) { assertNotNull(in); } } @Test - public void testOpenNonExistentQueryStream() throws Exception { - try { - helper.openQueryStream("Artist"); - fail("Exception expected - artist has no fetch spec."); - } catch (IOException ioex) { - // expected... - } + public void openNonExistentQueryStream() { + assertThrows(IOException.class, () -> helper.openQueryStream("Artist")); } } diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java index 098f92edb..61b5c8975 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java @@ -22,21 +22,21 @@ package org.apache.cayenne.wocompat; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.ObjRelationship; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.URL; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class EOModelProcessorInheritanceTest { private URL url; protected EOModelProcessor processor; - @Before + @BeforeEach public void setUp() throws Exception { processor = new EOModelProcessor(); @@ -45,7 +45,7 @@ public class EOModelProcessorInheritanceTest { } @Test - public void testLoadAbstractEntity() throws Exception { + public void loadAbstractEntity() throws Exception { DataMap map = processor.loadEOModel(url); ObjEntity abstractE = map.getObjEntity("AbstractEntity"); @@ -55,7 +55,7 @@ public class EOModelProcessorInheritanceTest { } @Test - public void testLoadConcreteEntity() throws Exception { + public void loadConcreteEntity() throws Exception { DataMap map = processor.loadEOModel(url); ObjEntity concreteE = map.getObjEntity("ConcreteEntityOne"); @@ -68,7 +68,7 @@ public class EOModelProcessorInheritanceTest { } @Test - public void testLoadFlattenedRelationship() throws Exception { + public void loadFlattenedRelationship() throws Exception { DataMap map = processor.loadEOModel(url); ObjEntity e1 = map.getObjEntity("HelperFlatEntity"); diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java index 83ddca47a..91cdb5210 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java @@ -30,33 +30,33 @@ import org.apache.cayenne.map.ObjRelationship; import org.apache.cayenne.map.QueryDescriptor; import org.apache.cayenne.map.SelectQueryDescriptor; import org.apache.cayenne.util.XMLEncoder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.PrintWriter; import java.net.URL; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class EOModelProcessorTest { protected EOModelProcessor processor; - @Before + @BeforeEach public void setUp() throws Exception { processor = new EOModelProcessor(); } @Test - public void testLoadModel() throws Exception { + public void loadModel() throws Exception { URL url = getClass().getClassLoader().getResource("wotests/art.eomodeld/"); assertNotNull(url); - + DataMap map = processor.loadEOModel(url); assertLoaded("art", map); assertLoadedQueries(map); @@ -65,7 +65,7 @@ public class EOModelProcessorTest { } @Test - public void testLoadModelWithDependencies() throws Exception { + public void loadModelWithDependencies() throws Exception { URL url = getClass().getClassLoader().getResource("wotests/cross-model-relationships.eomodeld/"); assertNotNull(url); @@ -88,7 +88,7 @@ public class EOModelProcessorTest { } @Test - public void testLoadFlattened() throws Exception { + public void loadFlattened() throws Exception { URL url = getClass().getClassLoader().getResource("wotests/flattened.eomodeld/"); assertNotNull(url); @@ -102,7 +102,7 @@ public class EOModelProcessorTest { } @Test - public void testLoadBrokenModel() throws Exception { + public void loadBrokenModel() throws Exception { URL url = getClass().getClassLoader().getResource("art-with-errors.eomodeld/"); assertNotNull(url); diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java index 741363c22..6c7e14ef3 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java @@ -24,29 +24,29 @@ import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.URL; import java.sql.Types; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class EOModelPrototypesTest { private URL url; - @Before + @BeforeEach public void setUp() throws Exception { url = getClass().getClassLoader().getResource("prototypes.eomodeld/"); assertNotNull(url); } @Test - public void testSkipPrototypes() throws Exception { + public void skipPrototypes() throws Exception { DataMap map = new EOModelProcessor().loadEOModel(url); assertNotNull(map.getObjEntity("Document")); @@ -55,7 +55,7 @@ public class EOModelPrototypesTest { } @Test - public void testDbAttributeType() throws Exception { + public void dbAttributeType() throws Exception { DataMap map = new EOModelProcessor().loadEOModel(url); DbEntity dbe = map.getDbEntity("DOCUMENT"); @@ -78,7 +78,7 @@ public class EOModelPrototypesTest { // nothing // to do with prototypes... @Test - public void testSameColumnMapping() throws Exception { + public void sameColumnMapping() throws Exception { DataMap map = new EOModelProcessor().loadEOModel(url); ObjEntity estimateOE = map.getObjEntity("Estimate"); @@ -102,7 +102,7 @@ public class EOModelPrototypesTest { // TODO: move this test to EOModelProcessorInheritanceTst. The original problem had // nothing to do with prototypes... @Test - public void testOverridingAttributes() throws Exception { + public void overridingAttributes() throws Exception { DataMap map = new EOModelProcessor().loadEOModel(url); ObjEntity estimateOE = map.getObjEntity("Estimate"); diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java index fb6b59626..ab423976c 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java @@ -21,22 +21,21 @@ package org.apache.cayenne.wocompat; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.query.PrefetchTreeNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URL; import java.util.Collection; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class EOQueryTest { @Test - public void testConstructor() throws Exception { - + public void constructor() throws Exception { + URL url = getClass().getClassLoader().getResource("wotests/fetchspec.eomodeld/"); assertNotNull(url); @@ -57,13 +56,13 @@ public class EOQueryTest { assertEquals( "(name = \"aa\") and (db:ID >= 7) and ((e2.name = \"bb\") or (db:e2.ID != 5))", query.getWhere().toString()); - + assertNotNull(query.getPrefetches()); - - Collection children= query.getPrefetches().getChildren(); + + Collection children = query.getPrefetches().getChildren(); assertEquals(1, children.size()); assertEquals("e2", ((PrefetchTreeNode) children.iterator().next()).getName()); - + assertTrue(query.isFetchingDataRows()); assertEquals(500, query.getLimit()); assertEquals(0, query.getPageSize()); diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java index 765909aa4..fc9530f79 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java @@ -20,7 +20,7 @@ package org.apache.cayenne.wocompat; import org.apache.cayenne.wocompat.unit.WOCompatCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.ArrayList; @@ -28,15 +28,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PropertyListSerializationTest extends WOCompatCase { @Test - public void testListPlist() throws Exception { - File plistFile = new File(setupTestDirectory("testListPlist"), "test-array.plist"); + public void listPlist() throws Exception { + File plistFile = new File(setupTestDirectory("listPlist"), "test-array.plist"); List<Object> list = new ArrayList<>(); list.add("str"); list.add(5); @@ -51,8 +51,8 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testMapPlist() throws Exception { - File plistFile = new File(setupTestDirectory("testMapPlist"), "test-map.plist"); + public void mapPlist() throws Exception { + File plistFile = new File(setupTestDirectory("mapPlist"), "test-map.plist"); Map<String, Object> map = new HashMap<>(); map.put("key1", "val"); map.put("key2", 5); @@ -67,9 +67,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testEmptyString() throws Exception { + public void emptyString() throws Exception { File plistFile = new File( - setupTestDirectory("testEmptyString"), + setupTestDirectory("emptyString"), "test-empty-string.plist"); Map<String, Object> map = new HashMap<>(); map.put("a", ""); @@ -84,9 +84,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithQuotes() throws Exception { + public void stringWithQuotes() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithQuotes"), + setupTestDirectory("stringWithQuotes"), "test-quotes.plist"); List<Object> list = new ArrayList<>(); list.add("s\"tr"); @@ -102,9 +102,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testNestedPlist() throws Exception { + public void nestedPlist() throws Exception { File plistFile = new File( - setupTestDirectory("testNestedPlist"), + setupTestDirectory("nestedPlist"), "test-nested.plist"); Map<String, Object> map = new HashMap<>(); map.put("key1", "val"); @@ -125,9 +125,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithSpaces() throws Exception { + public void stringWithSpaces() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithSpaces"), + setupTestDirectory("stringWithSpaces"), "test-spaces.plist"); List<Object> list = new ArrayList<>(); list.add("s tr"); @@ -143,9 +143,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithBraces() throws Exception { + public void stringWithBraces() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithBraces"), + setupTestDirectory("stringWithBraces"), "test-braces.plist"); List<Object> list = new ArrayList<>(); list.add("s{t)r"); @@ -161,9 +161,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithSlashes() throws Exception { + public void stringWithSlashes() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithSlashes"), + setupTestDirectory("stringWithSlashes"), "test-slashes.plist"); List<Object> list = new ArrayList<>(); list.add("s/t\\r"); @@ -179,9 +179,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithQuotes1() throws Exception { + public void stringWithQuotes1() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithQuotes1"), + setupTestDirectory("stringWithQuotes1"), "test-quotes1.plist"); List<Object> list = new ArrayList<>(); list.add("like"); @@ -198,9 +198,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithPlusMinus() throws Exception { + public void stringWithPlusMinus() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithPlusMinus"), + setupTestDirectory("stringWithPlusMinus"), "test-plus-minus.plist"); List<Object> list = new ArrayList<>(); list.add("a+b"); @@ -217,9 +217,9 @@ public class PropertyListSerializationTest extends WOCompatCase { } @Test - public void testStringWithLessGreater() throws Exception { + public void stringWithLessGreater() throws Exception { File plistFile = new File( - setupTestDirectory("testStringWithLessGreater"), + setupTestDirectory("stringWithLessGreater"), "test-less-greater.plist"); List<Object> list = new ArrayList<>(); list.add("a<b"); diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java index a75974c4e..58a8724cf 100644 --- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java +++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java @@ -19,7 +19,7 @@ package org.apache.cayenne.wocompat.parser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringReader; import java.util.ArrayList; @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PropertyListParserTest { @@ -38,7 +38,7 @@ public class PropertyListParserTest { } @Test - public void testListPlist() throws Exception { + public void listPlist() throws Exception { List list = new ArrayList(); list.add("str"); list.add(5); @@ -48,7 +48,7 @@ public class PropertyListParserTest { } @Test - public void testMapPlist() throws Exception { + public void mapPlist() throws Exception { Map map = new HashMap(); map.put("key1", "val"); map.put("key2", 5); @@ -58,7 +58,7 @@ public class PropertyListParserTest { } @Test - public void testStringWithQuotes() throws Exception { + public void stringWithQuotes() throws Exception { List list = new ArrayList(); list.add("s\"tr"); list.add(5); @@ -68,7 +68,7 @@ public class PropertyListParserTest { } @Test - public void testNestedPlist() throws Exception { + public void nestedPlist() throws Exception { Map map = new HashMap(); map.put("key1", "val"); map.put("key2", 5); @@ -82,7 +82,7 @@ public class PropertyListParserTest { } @Test - public void testStringWithSpaces() throws Exception { + public void stringWithSpaces() throws Exception { List list = new ArrayList(); list.add("s tr"); list.add(5); @@ -92,7 +92,7 @@ public class PropertyListParserTest { } @Test - public void testStringWithBraces() throws Exception { + public void stringWithBraces() throws Exception { List list = new ArrayList(); list.add("s{t)r"); list.add(5); @@ -101,7 +101,7 @@ public class PropertyListParserTest { } @Test - public void testStringWithSlashes() throws Exception { + public void stringWithSlashes() throws Exception { List list = new ArrayList(); list.add("s/t\\r"); list.add(5); @@ -110,7 +110,7 @@ public class PropertyListParserTest { } @Test - public void testMapWithLastSemicolon() throws Exception { + public void mapWithLastSemicolon() throws Exception { Map map = new HashMap(); map.put("key1", "val"); map.put("key2", 5); @@ -121,59 +121,59 @@ public class PropertyListParserTest { } @Test - public void testEmptyMap() throws Exception { + public void emptyMap() throws Exception { assertEquals(Collections.EMPTY_MAP, parser("{}").object("")); } @Test - public void testEmptyList() throws Exception { + public void emptyList() throws Exception { assertEquals(Collections.EMPTY_LIST, parser("()").object("")); } @Test - public void testOutsideComments() throws Exception { + public void outsideComments() throws Exception { List list = Collections.singletonList("str"); assertEquals(list, parser("// comment\n ( str)").object("")); } @Test - public void testInsideComments() throws Exception { + public void insideComments() throws Exception { List list = Collections.singletonList("str"); assertEquals(list, parser("(\n // comment\n str )").object("")); } @Test - public void testInsideKVComments() throws Exception { + public void insideKVComments() throws Exception { Map map = Collections.singletonMap("str", 5); assertEquals(map, parser("{\n str = // comment\n 5; }").object("")); } @Test - public void testTrailingComments() throws Exception { + public void trailingComments() throws Exception { List list = Collections.singletonList("str"); assertEquals(list, parser("(// comment\n str)").object("")); } @Test - public void testDoubleslashInsideLiteral() throws Exception { + public void doubleslashInsideLiteral() throws Exception { List list = Collections.singletonList("s//tr"); assertEquals(list, parser("( \"s//tr\" )").object("")); } @Test - public void testWindowsComments() throws Exception { + public void windowsComments() throws Exception { List list = Collections.singletonList("str"); assertEquals(list, parser("// comment\r\n ( str)").object("")); } @Test - public void testMacComments() throws Exception { + public void macComments() throws Exception { List list = Collections.singletonList("str"); assertEquals(list, parser("// comment\r ( str)").object("")); } @Test - public void testUNIXComments() throws Exception { + public void uNIXComments() throws Exception { List list = Collections.singletonList("str"); assertEquals(list, parser("// comment\n ( str)").object("")); }
