Author: dgeraskov Date: 2007-12-29 08:46:43 -0500 (Sat, 29 Dec 2007) New Revision: 5484 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java Log: http://jira.jboss.com/jira/browse/JBIDE-1571 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java 2007-12-29 13:46:43 UTC (rev 5484) @@ -0,0 +1,133 @@ +package org.hibernate.eclipse.console.test.mappingproject; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.jdt.ui.IPackagesViewPart; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; + +public class HibernateMappingTests extends TestCase { + + private MappingTestProject project; + + public HibernateMappingTests(String name) { + super(name); + } + + private TestResult result = null; + + protected void setUp() throws Exception { + super.setUp(); + this.project = MappingTestProject.getTestProject(); + + //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllPerspectives(false, true); + + + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective( + PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.ui.resourcePerspective")); + + IPackagesViewPart packageExplorer = null; + try { + packageExplorer = (IPackagesViewPart) PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().showView(JavaUI.ID_PACKAGES); + } catch (PartInitException e) { + throw new RuntimeException(e); + } + + packageExplorer.selectAndReveal(project.getIJavaProject()); + + waitForJobs(); + delay(2000); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#run(junit.framework.TestResult) + */ + @Override + public void run(TestResult result) { + this.result = result; + super.run(result); + + } + + public void tearDown() throws Exception { + waitForJobs(); + this.project.deleteIProject(); + waitForJobs(); + super.tearDown(); + } + + + /** + * Process UI input but do not return for the specified time interval. + * + * @param waitTimeMillis + * the number of milliseconds + */ + protected void delay(long waitTimeMillis) { + Display display = Display.getCurrent(); + + // If this is the UI thread, + // then process input. + if (display != null) { + long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; + while (System.currentTimeMillis() < endTimeMillis) { + if (!display.readAndDispatch()) + display.sleep(); + } + display.update(); + } + + // Otherwise, perform a simple sleep. + else { + try { + Thread.sleep(waitTimeMillis); + } catch (InterruptedException e) { + // Ignored. + } + } + } + + /** + * Wait until all background tasks are complete. + */ + public void waitForJobs() { + while (Platform.getJobManager().currentJob() != null) + delay(1000); + } + + protected MappingTestProject getProject() { + return this.project; + } + + public void testRunTestSet() { + TestSuite suite = TestSet.getTests(); + //is waytForJob() necessary between each test? + //suite.run(result); + for (int i = 0; i < suite.testCount(); i++) { + Test test = suite.testAt(i); + test.run(result); + /*if (result.failureCount() > 0){ + fail("Test " + test.getClass().getName() + " failed."); + } + if (result.errorCount() > 0){ + fail("Test " + test.getClass().getName() + " has errors."); + }*/ + waitForJobs(); + delay(20000); + } + if (result.failureCount() > 0){ + fail("One or more test failed."); + } + if (result.errorCount() > 0){ + fail("One or more test has error(s)."); + } + } +} + \ No newline at end of file Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java 2007-12-29 13:46:43 UTC (rev 5484) @@ -0,0 +1,33 @@ +package org.hibernate.eclipse.console.test.mappingproject; + +import org.eclipse.core.resources.ProjectScope; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.jdt.core.IJavaProject; +import org.hibernate.eclipse.console.utils.ProjectUtils; +import org.osgi.service.prefs.BackingStoreException; +import org.osgi.service.prefs.Preferences; + +import junit.framework.TestCase; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateNatureTest extends TestCase { + public void testEnableHibernateNature() throws BackingStoreException, CoreException { + MappingTestProject project = MappingTestProject.getTestProject(); + IJavaProject prj = project.getIJavaProject(); + IScopeContext scope = new ProjectScope(prj.getProject() ); + + Preferences node = scope.getNode("org.hibernate.eclipse.console"); + + node.putBoolean("hibernate3.enabled", true ); + node.put("default.configuration", "testcfg" ); + node.flush(); + + ProjectUtils.addProjectNature(prj.getProject(), "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() ); + ProjectUtils.removeProjectNature(prj.getProject(), "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() ); + } +} Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2007-12-29 13:46:43 UTC (rev 5484) @@ -0,0 +1,324 @@ +package org.hibernate.eclipse.console.test.mappingproject; + +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.PackageFragmentRoot; + + +/** + * @author Dmitry Geraskov + * + */ +public class MappingTestProject{ + + private static MappingTestProject singleton= null; + + private static final Path JRE_CONTAINER = new Path("org.eclipse.jdt.launching.JRE_CONTAINER"); + + public static String PROJECT_NAME = "MappingTestProject"; + public static String RESOURCE_PATH = "res/project/"; + + private static FileFilter fileFilter = new FileFilter(){ + public boolean accept(File pathname) { + return !pathname.isDirectory(); + }}; + + private static FileFilter dirFilter = new FileFilter(){ + public boolean accept(File pathname) { + //exclude ".svn" and other unnessesary folders + if (pathname.getName().charAt(0) == '.') return false; + return pathname.isDirectory(); + }}; + + private IProject project; + private IJavaProject javaProject; + + public static MappingTestProject getTestProject(){ + if (singleton == null){ + singleton = new MappingTestProject(); + } + return singleton; + } + + private MappingTestProject() { + initialize(); + } + + private void initialize(){ + try{ + buildBigTestProject(); + }catch(Exception e){ + throw new RuntimeException(e); + } + } + + public IProject getIProject(){ + return this.project; + } + + public IJavaProject getIJavaProject(){ + return this.javaProject; + } + + public void deleteIProject() throws CoreException { + project.delete(true, true, null); + } + + private void buildBigTestProject() throws JavaModelException, CoreException { + project = buildNewProject(PROJECT_NAME); + javaProject = buildJavaProject(project); + + + IPath resourcePath = new Path(RESOURCE_PATH); + File resourceFolder = resourcePath.toFile(); + if (!resourceFolder.exists()) + throw new RuntimeException("Folder " + RESOURCE_PATH + " not found!"); + + IPackageFragmentRoot sourceFolder = buildSourceFolder(project, javaProject); + recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource()); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + } + + private void recursiveCopyFiles(File src, IFolder dst){ + File[] files = src.listFiles(fileFilter); + for (int i = 0; i < files.length; i++) { + File file = files[i]; + if (!file.exists()) continue; + IFile iFile = dst.getFile(file.getName()); + try { + iFile.create(new FileInputStream(file), true, null); + } catch (FileNotFoundException e) { + e.printStackTrace(); + continue; + } catch (CoreException e) { + e.printStackTrace(); + continue; + } + } + + File[] dirs = src.listFiles(dirFilter); + for (int i = 0; i < dirs.length; i++) { + File dir = dirs[i]; + if (!dir.exists()) continue; + IFolder iFolder = dst.getFolder(dir.getName()); + try { + iFolder.create(true, true, null); + recursiveCopyFiles(dir, iFolder); + } catch (CoreException e) { + e.printStackTrace(); + continue; + } + } + } + + + private IProject buildNewProject(String projectName) { + // get a project handle + final IProject newProjectHandle = ResourcesPlugin.getWorkspace() + .getRoot().getProject(projectName); + + // get a project descriptor + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + final IProjectDescription description = workspace + .newProjectDescription(newProjectHandle.getName()); + + try { + createAndOpenProject(description, newProjectHandle); + } catch (CoreException ce) { + throw new RuntimeException(ce); + } + + return newProjectHandle; + } + + private void createAndOpenProject(IProjectDescription description, + IProject projectHandle) throws CoreException { + + projectHandle.create(description, null); + projectHandle.open(IResource.BACKGROUND_REFRESH, null); + } + + private IJavaProject buildJavaProject(IProject project) { + IJavaProject javaProject = JavaCore.create(project); + try { + setJavaNature(project); + } catch (CoreException ce) { + throw new RuntimeException(ce); + } + + javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5); + javaProject.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_5); + javaProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5); + return javaProject; + } + + private void setJavaNature(IProject project) throws CoreException { + IProjectDescription description = project.getDescription(); + description.setNatureIds(new String[] { JavaCore.NATURE_ID }); + project.setDescription(description, null); + } + + + private IPackageFragmentRoot buildSourceFolder(IProject project, + IJavaProject javaProject) throws CoreException { + IFolder folder = project.getFolder("src"); + if (!folder.exists()){ + folder.create(false, true, null); + IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder); + IClasspathEntry[] newEntries = { JavaCore + .newSourceEntry(root.getPath()) , JavaCore + .newContainerEntry(JRE_CONTAINER)}; + javaProject.setRawClasspath(newEntries, null); + return root; + } + return javaProject.getPackageFragmentRoot(folder); + } + + + + /*private boolean removePackage(String name, IProject project, + IJavaProject javaProject) { + IFolder folder = project.getFolder("src"); + IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder); + IPackageFragment useless = root.getPackageFragment(name); + if (useless != null){ + try { + useless.delete(true, new NullProgressMonitor()); + } catch (JavaModelException e) { + return false; + } + return true; + } + return false; + } + + /*private IPackageFragment buildPackage(String name, IProject project, + IJavaProject javaProject) throws CoreException { + IPackageFragmentRoot sourceFolder = buildSourceFolder(project, + javaProject); + return sourceFolder.createPackageFragment(name, false, null); + } + + private IType[] buildTypes(IProject project, IJavaProject javaProject, CompilationPack compPack) throws CoreException + /*throws CoreException*/ //{ + + //create empty ICompilationUnit + //String cuName = compPack.getPack().getName(); + /*IPackageFragment jPack = buildPackage(compPack.getPack(), project, javaProject); + ICompilationUnit cu = null;//jPack.createCompilationUnit(cuName, + //"", false, null); + + List<IType> result = new ArrayList<IType>(); + + InputStream is; + try { + File[] files = compPack.getFiles(); + for (int i = 0; i < files.length; i++) { + if (files[i].getName().endsWith(".java")){ + is = new FileInputStream(files[i]); + String fileBody = getStringFromStream(is); + + //ASTParser parser = ASTParser.newParser(AST.JLS3); + //parser.setSource(fileBody.toCharArray()); + //CompilationUnit cu2 = (CompilationUnit) parser.createAST(null); + String cuName = files[i].getName(); + + try { + cu = jPack.createCompilationUnit(cuName, fileBody, false, null); + result.addAll(Arrays.asList(cu.getAllTypes())); + } catch (JavaModelException e) { + e.printStackTrace(); + System.out.println("Error compiling file " + files[i].getAbsolutePath()); + } + } + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + for (int i = 0; i < result.size(); i++) { + System.out.println(((IType)result.get(i)).getElementName()); + } + return (IType[])result.toArray(new IType[0]); + } + + public static String getStringFromStream (InputStream is) + throws IOException + { + try { + InputStreamReader reader = new InputStreamReader(is); + char[] buffer = new char[1024]; + StringWriter writer = new StringWriter(); + int bytes_read; + while ((bytes_read = reader.read(buffer)) != -1) + { + writer.write(buffer, 0, bytes_read); + } + return (writer.toString()); + } + finally { + if (null != is) is.close(); + } + } + + private void createCompilationPacks(File pack, List<CompilationPack> compPacks, String packName){ + if (pack.isDirectory()){ + if (packName.length() != 0) packName += '.'; + packName += pack.getName(); + + File[] files = pack.listFiles(fileFilter); + if (files.length > 0) compPacks.add(new CompilationPack(packName, files)); + + File[] dirs = pack.listFiles(dirFilter); + for (int i = 0; i < dirs.length; i++) { + createCompilationPacks(dirs[i], compPacks, packName); + } + } + } + + public class CompilationPack { + + private String pack = null; + + private File[] files = null; + + CompilationPack (String pack, File[] files){ + this.pack = pack; + this.files = files; + } + + public String getPack() { + return pack; + } + + public File[] getFiles() { + return files; + } + }*/ + +} Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2007-12-29 13:46:43 UTC (rev 5484) @@ -0,0 +1,51 @@ +package org.hibernate.eclipse.console.test.mappingproject; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.PackageFragmentRoot; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; + +/** + * @author Dmitry Geraskov + * just to test that our external Unit tests work right with MappingTestProject + */ +public class OpenJavaEditors extends TestCase { + + public void testOpenJavaEditor() throws JavaModelException { + MappingTestProject mapProject = MappingTestProject.getTestProject(); + + IPackageFragmentRoot[] roots = mapProject.getIJavaProject().getAllPackageFragmentRoots(); + for (int i = 0; i < roots.length; i++) { + if (roots[i].getClass() != PackageFragmentRoot.class) continue; + PackageFragmentRoot packageFragmentRoot = (PackageFragmentRoot) roots[i]; + IJavaElement[] els = packageFragmentRoot.getChildren();//.getCompilationUnits(); + for (int j = 0; j < els.length; j++) { + IJavaElement javaElement = els[j]; + if (javaElement instanceof IPackageFragment){ + ICompilationUnit[] cus = ((IPackageFragment)javaElement).getCompilationUnits(); + for (int k = 0; k < cus.length; k++) { + ICompilationUnit compilationUnit = cus[k]; + FileEditorInput input = new FileEditorInput((IFile) compilationUnit.getCorrespondingResource()); + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, JavaUI.ID_CU_EDITOR ); + } catch (PartInitException e) { + fail("Error opening CompilationUnit: " + e.getMessage()); + } + } + } + } + } + + //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); + } +} Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java 2007-12-29 13:46:43 UTC (rev 5484) @@ -0,0 +1,20 @@ +package org.hibernate.eclipse.console.test.mappingproject; + +import junit.framework.TestSuite; + +/** + * @author Dmitry Geraskov + * + */ +public class TestSet{ + + public static TestSuite getTests(){ + TestSuite suite = new TestSuite("Test for MappingTestProject" ); + //use only addTestSuit to prevent errors + suite.addTestSuite( OpenJavaEditors.class ); + suite.addTestSuite( HibernateNatureTest.class ); + + return suite; + } + +} Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native