[jboss-svn-commits] JBL Code SVN: r36064 - in labs/jbossrules/trunk/drools-eclipse: org.drools.eclipse.test and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Nov 25 08:11:45 EST 2010


Author: ge0ffrey
Date: 2010-11-25 08:11:43 -0500 (Thu, 25 Nov 2010)
New Revision: 36064

Added:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/pom.xml
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTestDisabled.java
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/pom.xml
Removed:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java
Modified:
   labs/jbossrules/trunk/drools-eclipse/pom.xml
Log:
eclipse plugin tests

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/pom.xml (from rev 36061, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.feature/pom.xml)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/pom.xml	2010-11-25 13:11:43 UTC (rev 36064)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.drools</groupId>
+    <artifactId>drools-eclipse</artifactId>
+    <version>5.2.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.drools.eclipse.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <name>Drools :: Eclipse :: Base test</name>
+
+</project>

Deleted: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java	2010-11-25 11:36:58 UTC (rev 36063)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java	2010-11-25 13:11:43 UTC (rev 36064)
@@ -1,239 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.eclipse.editors.rete;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.drools.eclipse.editors.DRLRuleEditor2;
-import org.drools.eclipse.editors.ZoomInAction2;
-import org.drools.eclipse.editors.ZoomOutAction2;
-import org.eclipse.core.filebuffers.manipulation.ContainerCreator;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-public class ZoomControlTest extends TestCase {
-
-    private IFile                         fFile1;
-    private IFile                         fFile2;
-
-    private final static IProgressMonitor NULL_MONITOR     = new NullProgressMonitor();
-
-    private static final String           ORIGINAL_CONTENT = "package test\nrule \"a\"\nend\nrule \"b\"\nend";
-
-    public ZoomControlTest(String name) {
-        super( name );
-    }
-
-    private String getOriginalContent() {
-        return ORIGINAL_CONTENT;
-    }
-
-    /*
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        IFolder folder = createFolder( "ZoomControlTestProject/multipleEditorTest/" );
-        fFile1 = createFile( folder,
-                             "myfile1.drl",
-                             getOriginalContent() );
-        fFile2 = createFile( folder,
-                             "myfile2.drl",
-                             getOriginalContent() );
-    }
-
-    /*
-     * @see junit.framework.TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        deleteProject( "ZoomControlTestProject" );
-        fFile1 = null;
-        fFile2 = null;
-    }
-
-    public void testMultipleEditors() throws PartInitException {
-
-        IWorkbench workbench = PlatformUI.getWorkbench();
-        IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
-
-        DRLRuleEditor2 part1 = (DRLRuleEditor2) IDE.openEditor( page,
-                                                                fFile1 );
-        DRLRuleEditor2 part2 = (DRLRuleEditor2) IDE.openEditor( page,
-                                                                fFile2 );
-
-        checkVisibility( part1,
-                         part2,
-                         false );
-
-        // Editor1 active
-        page.activate( part1 );
-        checkVisibility( part1,
-                         part2,
-                         false );
-// TODO
-//        part1.setActivePage( 1 );
-//        checkVisibility( part1,
-//                         part2,
-//                         true );
-//
-//        part1.setActivePage( 0 );
-//        checkVisibility( part1,
-//                         part2,
-//                         false );
-//
-//        part1.setActivePage( 1 );
-//        checkVisibility( part1,
-//                         part2,
-//                         true );
-//
-//        // Editor2 active
-//        page.activate( part2 );
-//        part2.setActivePage( 0 );
-//        checkVisibility( part1,
-//                         part2,
-//                         false );
-//
-//        part2.setActivePage( 1 );
-//        checkVisibility( part1,
-//                         part2,
-//                         true );
-//
-//        // Editor1 active
-//        page.activate( part1 );
-//        checkVisibility( part1,
-//                         part2,
-//                         true );
-//
-//        // Editor2 active
-//        page.activate( part2 );
-//        checkVisibility( part1,
-//                         part2,
-//                         true );
-//
-//        part2.setActivePage( 0 );
-//        checkVisibility( part1,
-//                         part2,
-//                         false );
-//
-//        // Editor1 active
-//        page.activate( part1 );
-//        checkVisibility( part1,
-//                         part2,
-//                         true );
-//        part2.setActivePage( 0 );
-//        checkVisibility( part1,
-//                         part2,
-//                         false );
-
-    }
-
-    public void testSecondEditorAfterFirst() throws PartInitException {
-
-        IWorkbench workbench = PlatformUI.getWorkbench();
-        IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
-
-        DRLRuleEditor2 part1 = (DRLRuleEditor2) IDE.openEditor( page,
-                                                                fFile1 );
-// TODO
-//        // Editor1 active
-//        page.activate( part1 );
-//        part1.setActivePage( 1 );
-//        checkVisibility( part1,
-//                         null,
-//                         true );
-//
-//        DRLRuleEditor2 part2 = (DRLRuleEditor2) IDE.openEditor( page,
-//                                                                fFile2 );
-//        page.activate( part2 );
-//        checkVisibility( part1,
-//                         part2,
-//                         false );
-
-    }
-
-    private void checkVisibility(DRLRuleEditor2 part1,
-                                 DRLRuleEditor2 part2,
-                                 boolean enabled) {
-        if ( part1 != null ) {
-            checkVisibility( part1,
-                             enabled );
-        }
-
-        if ( part2 != null ) {
-            checkVisibility( part2,
-                             enabled );
-        }
-    }
-
-    private void checkVisibility(DRLRuleEditor2 editor,
-                                 boolean enabled) {
-        ZoomInAction2 zoomIn = (ZoomInAction2) editor.getAdapter( ZoomInAction2.class );
-        ZoomOutAction2 zoomOut = (ZoomOutAction2) editor.getAdapter( ZoomOutAction2.class );
-        ZoomComboContributionItem zitem = (ZoomComboContributionItem) editor.getAdapter( ZoomComboContributionItem.class );
-
-        assertEquals( enabled,
-                      zoomIn.isEnabled() );
-        assertEquals( enabled,
-                      zoomOut.isEnabled() );
-        assertEquals( enabled,
-                      zitem.getZoomManager() != null );
-
-    }
-
-    private IFile createFile(IFolder folder,
-                             String name,
-                             String contents) throws CoreException {
-        IFile file = folder.getFile( name );
-        InputStream inputStream = new ByteArrayInputStream( contents.getBytes() );
-        file.create( inputStream,
-                     true,
-                     NULL_MONITOR );
-        return file;
-    }
-
-    private IFolder createFolder(String portableFolderPath) throws CoreException {
-        ContainerCreator creator = new ContainerCreator( ResourcesPlugin.getWorkspace(),
-                                                         new Path( portableFolderPath ) );
-        IContainer container = creator.createContainer( NULL_MONITOR );
-        return (IFolder) container;
-    }
-
-    private void deleteProject(String projectName) throws CoreException {
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IProject project = root.getProject( projectName );
-        if ( project.exists() ) project.delete( true,
-                                                true,
-                                                NULL_MONITOR );
-    }
-
-}

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTestDisabled.java (from rev 36061, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTestDisabled.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTestDisabled.java	2010-11-25 13:11:43 UTC (rev 36064)
@@ -0,0 +1,239 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.eclipse.editors.rete;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.drools.eclipse.editors.DRLRuleEditor2;
+import org.drools.eclipse.editors.ZoomInAction2;
+import org.drools.eclipse.editors.ZoomOutAction2;
+import org.eclipse.core.filebuffers.manipulation.ContainerCreator;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+public class ZoomControlTestDisabled extends TestCase {
+
+    private IFile                         fFile1;
+    private IFile                         fFile2;
+
+    private final static IProgressMonitor NULL_MONITOR     = new NullProgressMonitor();
+
+    private static final String           ORIGINAL_CONTENT = "package test\nrule \"a\"\nend\nrule \"b\"\nend";
+
+    public ZoomControlTestDisabled(String name) {
+        super( name );
+    }
+
+    private String getOriginalContent() {
+        return ORIGINAL_CONTENT;
+    }
+
+    /*
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        IFolder folder = createFolder( "ZoomControlTestProject/multipleEditorTest/" );
+        fFile1 = createFile( folder,
+                             "myfile1.drl",
+                             getOriginalContent() );
+        fFile2 = createFile( folder,
+                             "myfile2.drl",
+                             getOriginalContent() );
+    }
+
+    /*
+     * @see junit.framework.TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception {
+        deleteProject( "ZoomControlTestProject" );
+        fFile1 = null;
+        fFile2 = null;
+    }
+
+    public void testMultipleEditors() throws PartInitException {
+
+        IWorkbench workbench = PlatformUI.getWorkbench();
+        IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
+
+        DRLRuleEditor2 part1 = (DRLRuleEditor2) IDE.openEditor( page,
+                                                                fFile1 );
+        DRLRuleEditor2 part2 = (DRLRuleEditor2) IDE.openEditor( page,
+                                                                fFile2 );
+
+        checkVisibility( part1,
+                         part2,
+                         false );
+
+        // Editor1 active
+        page.activate( part1 );
+        checkVisibility( part1,
+                         part2,
+                         false );
+// TODO
+//        part1.setActivePage( 1 );
+//        checkVisibility( part1,
+//                         part2,
+//                         true );
+//
+//        part1.setActivePage( 0 );
+//        checkVisibility( part1,
+//                         part2,
+//                         false );
+//
+//        part1.setActivePage( 1 );
+//        checkVisibility( part1,
+//                         part2,
+//                         true );
+//
+//        // Editor2 active
+//        page.activate( part2 );
+//        part2.setActivePage( 0 );
+//        checkVisibility( part1,
+//                         part2,
+//                         false );
+//
+//        part2.setActivePage( 1 );
+//        checkVisibility( part1,
+//                         part2,
+//                         true );
+//
+//        // Editor1 active
+//        page.activate( part1 );
+//        checkVisibility( part1,
+//                         part2,
+//                         true );
+//
+//        // Editor2 active
+//        page.activate( part2 );
+//        checkVisibility( part1,
+//                         part2,
+//                         true );
+//
+//        part2.setActivePage( 0 );
+//        checkVisibility( part1,
+//                         part2,
+//                         false );
+//
+//        // Editor1 active
+//        page.activate( part1 );
+//        checkVisibility( part1,
+//                         part2,
+//                         true );
+//        part2.setActivePage( 0 );
+//        checkVisibility( part1,
+//                         part2,
+//                         false );
+
+    }
+
+    public void testSecondEditorAfterFirst() throws PartInitException {
+
+        IWorkbench workbench = PlatformUI.getWorkbench();
+        IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
+
+        DRLRuleEditor2 part1 = (DRLRuleEditor2) IDE.openEditor( page,
+                                                                fFile1 );
+// TODO
+//        // Editor1 active
+//        page.activate( part1 );
+//        part1.setActivePage( 1 );
+//        checkVisibility( part1,
+//                         null,
+//                         true );
+//
+//        DRLRuleEditor2 part2 = (DRLRuleEditor2) IDE.openEditor( page,
+//                                                                fFile2 );
+//        page.activate( part2 );
+//        checkVisibility( part1,
+//                         part2,
+//                         false );
+
+    }
+
+    private void checkVisibility(DRLRuleEditor2 part1,
+                                 DRLRuleEditor2 part2,
+                                 boolean enabled) {
+        if ( part1 != null ) {
+            checkVisibility( part1,
+                             enabled );
+        }
+
+        if ( part2 != null ) {
+            checkVisibility( part2,
+                             enabled );
+        }
+    }
+
+    private void checkVisibility(DRLRuleEditor2 editor,
+                                 boolean enabled) {
+        ZoomInAction2 zoomIn = (ZoomInAction2) editor.getAdapter( ZoomInAction2.class );
+        ZoomOutAction2 zoomOut = (ZoomOutAction2) editor.getAdapter( ZoomOutAction2.class );
+        ZoomComboContributionItem zitem = (ZoomComboContributionItem) editor.getAdapter( ZoomComboContributionItem.class );
+
+        assertEquals( enabled,
+                      zoomIn.isEnabled() );
+        assertEquals( enabled,
+                      zoomOut.isEnabled() );
+        assertEquals( enabled,
+                      zitem.getZoomManager() != null );
+
+    }
+
+    private IFile createFile(IFolder folder,
+                             String name,
+                             String contents) throws CoreException {
+        IFile file = folder.getFile( name );
+        InputStream inputStream = new ByteArrayInputStream( contents.getBytes() );
+        file.create( inputStream,
+                     true,
+                     NULL_MONITOR );
+        return file;
+    }
+
+    private IFolder createFolder(String portableFolderPath) throws CoreException {
+        ContainerCreator creator = new ContainerCreator( ResourcesPlugin.getWorkspace(),
+                                                         new Path( portableFolderPath ) );
+        IContainer container = creator.createContainer( NULL_MONITOR );
+        return (IFolder) container;
+    }
+
+    private void deleteProject(String projectName) throws CoreException {
+        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+        IProject project = root.getProject( projectName );
+        if ( project.exists() ) project.delete( true,
+                                                true,
+                                                NULL_MONITOR );
+    }
+
+}

Added: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools.test/pom.xml	2010-11-25 13:11:43 UTC (rev 36064)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.drools</groupId>
+    <artifactId>drools-eclipse</artifactId>
+    <version>5.2.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.guvnor.tools.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <name>Drools :: Eclipse :: Guvnor tools test</name>
+
+</project>

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2010-11-25 11:36:58 UTC (rev 36063)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2010-11-25 13:11:43 UTC (rev 36064)
@@ -28,11 +28,13 @@
   <modules>
     <module>org.drools.eclipse</module>
     <module>org.drools.eclipse.feature</module>
+    <module>org.drools.eclipse.test</module>
     <module>org.drools.eclipse.task</module>
     <module>org.drools.eclipse.task.feature</module>
     <module>org.eclipse.webdav</module>
     <module>org.guvnor.tools</module>
     <module>org.guvnor.tools.feature</module>
+    <!--<module>org.guvnor.tools.test</module>--><!-- TODO enable me if p2 repo has org.jboss.tools.tests 3.1.0 -->
     <module>org.drools.updatesite</module>
   </modules>
 
@@ -101,6 +103,11 @@
           </environments>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>maven-osgi-test-plugin</artifactId>
+        <version>${tycho.version}</version>
+      </plugin>
     </plugins>
   </build>
 



More information about the jboss-svn-commits mailing list