diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java')
| -rw-r--r-- | jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java index 5ceb93e903..541ba70e81 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaQueryHintTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,11 +11,12 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Kind; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.QueryHint; import org.eclipse.jpt.jpa.core.resource.java.JPA; -import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @@ -50,10 +51,11 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation queryHintAnnotation = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); assertNull(queryHintAnnotation.getName()); assertNull(queryHint.getName()); @@ -75,22 +77,23 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); - assertNull(javaQueryhint.getName()); + assertNull(queryHintAnnotation.getName()); assertNull(queryHint.getName()); //set name in the context model, verify resource model updated queryHint.setName("foo"); - assertEquals("foo", javaQueryhint.getName()); + assertEquals("foo", queryHintAnnotation.getName()); assertEquals("foo", queryHint.getName()); //set name to null in the context model queryHint.setName(null); - assertNull(javaQueryhint.getName()); + assertNull(queryHintAnnotation.getName()); assertNull(queryHint.getName()); } @@ -99,10 +102,11 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation queryHintAnnotation = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); assertNull(queryHintAnnotation.getValue()); assertNull(queryHint.getValue()); @@ -124,22 +128,23 @@ public class JavaQueryHintTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); Entity entity = getJavaEntity(); - QueryHint queryHint = entity.getQueryContainer().namedQueries().next().getHints().iterator().next(); + QueryHint queryHint = entity.getQueryContainer().getNamedQueries().iterator().next().getHints().iterator().next(); - JavaResourcePersistentType typeResource = getJpaProject().getJavaResourcePersistentType(FULLY_QUALIFIED_TYPE_NAME); - QueryHintAnnotation javaQueryhint = ((NamedQueryAnnotation) typeResource.getAnnotation(NamedQueryAnnotation.ANNOTATION_NAME)).hints().next(); + JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, Kind.TYPE); + NamedQueryAnnotation queryAnnotation = ((NamedQueryAnnotation) resourceType.getAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME)); + QueryHintAnnotation queryHintAnnotation = queryAnnotation.getHints().iterator().next(); - assertNull(javaQueryhint.getValue()); + assertNull(queryHintAnnotation.getValue()); assertNull(queryHint.getValue()); //set name in the context model, verify resource model updated queryHint.setValue("foo"); - assertEquals("foo", javaQueryhint.getValue()); + assertEquals("foo", queryHintAnnotation.getValue()); assertEquals("foo", queryHint.getValue()); //set name to null in the context model queryHint.setValue(null); - assertNull(javaQueryhint.getValue()); + assertNull(queryHintAnnotation.getValue()); assertNull(queryHint.getValue()); } } |