Repository: cayenne Updated Branches: refs/heads/master 8bbd3af45 -> 521abec97
refactoring unit test... repeated init code should be in @Before Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/521abec9 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/521abec9 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/521abec9 Branch: refs/heads/master Commit: 521abec97aa96dbc054498e2748164d65d7e0310 Parents: 8bbd3af Author: aadamchik <aadamc...@apache.org> Authored: Sun Sep 13 13:39:17 2015 -0400 Committer: aadamchik <aadamc...@apache.org> Committed: Sun Sep 13 13:39:17 2015 -0400 ---------------------------------------------------------------------- .../ejbql/EJBQLCompiledExpressionIT.java | 168 +++++++++---------- 1 file changed, 77 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/521abec9/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java index 1c85c60..5ccba20 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLCompiledExpressionIT.java @@ -18,105 +18,91 @@ ****************************************************************/ package org.apache.cayenne.ejbql; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; - @UseServerRuntime(CayenneProjects.TESTMAP_PROJECT) public class EJBQLCompiledExpressionIT extends ServerCase { - - @Inject - protected ServerRuntime runtime; - - @Test - public void testGetSource() { - String source = "select a from Artist a"; - EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); - EJBQLParser parser = EJBQLParserFactory.getParser(); - - EJBQLCompiledExpression select = parser.compile(source, resolver); - assertEquals(source, select.getSource()); - } - - @Test - public void testGetExpression() { - String source = "select a from Artist a"; - EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); - EJBQLParser parser = EJBQLParserFactory.getParser(); - - EJBQLCompiledExpression select = parser.compile(source, resolver); - assertNotNull(select.getExpression()); - } - - @Test - public void testGetEntityDescriptor() { - EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); - EJBQLParser parser = EJBQLParserFactory.getParser(); - - EJBQLCompiledExpression select = parser.compile( - "select a from Artist a", - resolver); - - assertNotNull(select.getEntityDescriptor("a")); - assertSame(resolver.getClassDescriptor("Artist"), select.getEntityDescriptor("a")); - - EJBQLCompiledExpression select1 = parser.compile( - "select p from Painting p WHERE p.toArtist.artistName = 'a'", - resolver); - assertNotNull(select1.getEntityDescriptor("p")); - assertSame(resolver.getClassDescriptor("Painting"), select1 - .getEntityDescriptor("p")); - - assertNotNull(select1.getEntityDescriptor("p.toArtist")); - assertSame(resolver.getClassDescriptor("Artist"), select1 - .getEntityDescriptor("p.toArtist")); - } - - @Test - public void testGetRootDescriptor() { - EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); - EJBQLParser parser = EJBQLParserFactory.getParser(); - - EJBQLCompiledExpression select = parser.compile( - "select a from Artist a", - resolver); - - assertSame("Root is not detected: " + select.getExpression(), resolver - .getClassDescriptor("Artist"), select.getRootDescriptor()); - } - - @Test - public void testGetEntityDescriptorCaseSensitivity() { - EntityResolver resolver = runtime.getDataDomain().getEntityResolver(); - EJBQLParser parser = EJBQLParserFactory.getParser(); - - EJBQLCompiledExpression select1 = parser.compile( - "select a from Artist a", - resolver); - - assertNotNull(select1.getEntityDescriptor("a")); - assertNotNull(select1.getEntityDescriptor("A")); - - EJBQLCompiledExpression select2 = parser.compile( - "select A from Artist A", - resolver); - - assertNotNull(select2.getEntityDescriptor("a")); - assertNotNull(select2.getEntityDescriptor("A")); - - EJBQLCompiledExpression select3 = parser.compile( - "select a from Artist A", - resolver); - - assertNotNull(select3.getEntityDescriptor("a")); - assertNotNull(select3.getEntityDescriptor("A")); - } + + @Inject + protected ServerRuntime runtime; + + private EJBQLParser parser; + private EntityResolver resolver; + + @Before + public void before() { + resolver = runtime.getDataDomain().getEntityResolver(); + parser = EJBQLParserFactory.getParser(); + } + + @Test + public void testGetSource() { + String source = "select a from Artist a"; + + EJBQLCompiledExpression select = parser.compile(source, resolver); + assertEquals(source, select.getSource()); + } + + @Test + public void testGetExpression() { + String source = "select a from Artist a"; + EJBQLCompiledExpression select = parser.compile(source, resolver); + assertNotNull(select.getExpression()); + } + + @Test + public void testGetEntityDescriptor() { + + EJBQLCompiledExpression select = parser.compile("select a from Artist a", resolver); + + assertNotNull(select.getEntityDescriptor("a")); + assertSame(resolver.getClassDescriptor("Artist"), select.getEntityDescriptor("a")); + + EJBQLCompiledExpression select1 = parser.compile("select p from Painting p WHERE p.toArtist.artistName = 'a'", + resolver); + assertNotNull(select1.getEntityDescriptor("p")); + assertSame(resolver.getClassDescriptor("Painting"), select1.getEntityDescriptor("p")); + + assertNotNull(select1.getEntityDescriptor("p.toArtist")); + assertSame(resolver.getClassDescriptor("Artist"), select1.getEntityDescriptor("p.toArtist")); + } + + @Test + public void testGetRootDescriptor() { + + EJBQLCompiledExpression select = parser.compile("select a from Artist a", resolver); + + assertSame("Root is not detected: " + select.getExpression(), resolver.getClassDescriptor("Artist"), + select.getRootDescriptor()); + } + + @Test + public void testGetEntityDescriptorCaseSensitivity() { + + EJBQLCompiledExpression select1 = parser.compile("select a from Artist a", resolver); + + assertNotNull(select1.getEntityDescriptor("a")); + assertNotNull(select1.getEntityDescriptor("A")); + + EJBQLCompiledExpression select2 = parser.compile("select A from Artist A", resolver); + + assertNotNull(select2.getEntityDescriptor("a")); + assertNotNull(select2.getEntityDescriptor("A")); + + EJBQLCompiledExpression select3 = parser.compile("select a from Artist A", resolver); + + assertNotNull(select3.getEntityDescriptor("a")); + assertNotNull(select3.getEntityDescriptor("A")); + } }
