Author: scabanovich Date: 2010-12-29 07:19:27 -0500 (Wed, 29 Dec 2010) New Revision: 27793 Added: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/demo/ trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/demo/User.java trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/util/test/EclipseJavaUtilTest.java Modified: trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java Log: JBIDE-8011 https://issues.jboss.org/browse/JBIDE-8011 Modified: trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2010-12-29 12:17:58 UTC (rev 27792) +++ trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2010-12-29 12:19:27 UTC (rev 27793) @@ -9,6 +9,7 @@ Require-Bundle: org.junit, org.eclipse.core.runtime, + org.eclipse.jdt.core, org.eclipse.core.resources, org.jboss.tools.common.model, org.jboss.tools.common.test, Added: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/demo/User.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/demo/User.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/demo/User.java 2010-12-29 12:19:27 UTC (rev 27793) @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by JBoss Developer Studio + */ +public class User { + + private String name; + + /** + * @return User Name + */ + public String getST() { + return name; + } + + /** + * @param User Name + */ + public void setST(String name) { + this.name = name; + } + + public boolean isBooleanValue1() { + return true; + } + + public Boolean isBooleanValue2() { + return Boolean.TRUE; + } + + public int isBooleanValue3() { + return 0; + } + + public void getVoid() { + + } + + public int getIntValue() { + return 0; + } +} \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test1/src/demo/User.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java 2010-12-29 12:17:58 UTC (rev 27792) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java 2010-12-29 12:19:27 UTC (rev 27793) @@ -12,6 +12,7 @@ import org.jboss.tools.common.ant.parser.test.AntParserTest; import org.jboss.tools.common.model.exception.test.DeveloperExceptionTest; +import org.jboss.tools.common.model.util.test.EclipseJavaUtilTest; import junit.framework.Test; import junit.framework.TestSuite; @@ -32,6 +33,7 @@ suite.addTestSuite(XModelTransferBufferTest.class); suite.addTestSuite(PropertiesLoaderTest.class); suite.addTestSuite(JarAccessTest.class); + suite.addTestSuite(EclipseJavaUtilTest.class); return suite; } } Added: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/util/test/EclipseJavaUtilTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/util/test/EclipseJavaUtilTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/util/test/EclipseJavaUtilTest.java 2010-12-29 12:19:27 UTC (rev 27793) @@ -0,0 +1,73 @@ +package org.jboss.tools.common.model.util.test; + +import java.util.HashMap; +import java.util.Map; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.util.BeanUtil; +import org.jboss.tools.common.util.EclipseJavaUtil; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; + +public class EclipseJavaUtilTest extends TestCase { + + static String BUNDLE_NAME = "org.jboss.tools.common.model.test"; + TestProjectProvider provider1 = null; + IProject project1 = null; + + public void setUp() throws Exception { + provider1 = new TestProjectProvider(BUNDLE_NAME, null, "Test1", true); + project1 = provider1.getProject(); + + project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + + JobUtils.waitForIdle(); + } + + public void testGetters() throws Exception { + IJavaProject jp = EclipseResourceUtil.getJavaProject(project1); + assertNotNull(jp); + + IType user = EclipseJavaUtil.findType(jp, "demo.User"); + assertNotNull(user); + + IMethod[] ms = user.getMethods(); + Map<String, IMethod> methods = new HashMap<String, IMethod>(); + for (IMethod m: ms) methods.put(m.getElementName(), m); + + IMethod m = methods.get("isBooleanValue1"); + assertNotNull(m); + assertEquals("boolean", EclipseJavaUtil.getMemberTypeAsString(m)); + assertTrue("Method isBooleanValue1() is not recognized as getter", BeanUtil.isGetter(m)); + + m = methods.get("isBooleanValue2"); + assertNotNull(m); + assertEquals("java.lang.Boolean", EclipseJavaUtil.getMemberTypeAsString(m)); + assertTrue("Method isBooleanValue2() is not recognized as getter", BeanUtil.isGetter(m)); + + m = methods.get("isBooleanValue3"); + assertNotNull(m); + assertEquals("int", EclipseJavaUtil.getMemberTypeAsString(m)); + assertFalse("Method isBooleanValue3() is misrecognized as getter", BeanUtil.isGetter(m)); + + m = methods.get("getVoid"); + assertNotNull(m); + assertEquals("void", EclipseJavaUtil.getMemberTypeAsString(m)); + assertFalse("Method getVoid() is misrecognized as getter", BeanUtil.isGetter(m)); + + m = methods.get("getIntValue"); + assertNotNull(m); + assertEquals("int", EclipseJavaUtil.getMemberTypeAsString(m)); + assertTrue("Method getIntValue() is not recognized as getter", BeanUtil.isGetter(m)); + + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/util/test/EclipseJavaUtilTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain