[jboss-svn-commits] JBL Code SVN: r10792 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test: java/org/drools/eclipse/editors and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Apr 5 21:18:53 EDT 2007


Author: KrisVerlaenen
Date: 2007-04-05 21:18:53 -0400 (Thu, 05 Apr 2007)
New Revision: 10792

Added:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/outline/
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/outline/RuleContentOutlineTest.java
Removed:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/RuleContentOutlineTest.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/ide/
Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/DRLCompletionProcessorTest.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ReteooLayoutFactoryTest.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/resources/simplerule.drl
Log:
Updated tests for new build

Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/RuleContentOutlineTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/RuleContentOutlineTest.java	2007-04-06 01:15:28 UTC (rev 10791)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/RuleContentOutlineTest.java	2007-04-06 01:18:53 UTC (rev 10792)
@@ -1,38 +0,0 @@
-package org.drools.eclipse.editors;
-
-import junit.framework.TestCase;
-//POM
-//import org.drools.eclipse.editors.outline.FunctionTreeNode;
-//import org.drools.eclipse.editors.outline.PackageTreeNode;
-import org.drools.eclipse.editors.outline.RuleContentOutlinePage;
-
-public class RuleContentOutlineTest extends TestCase {
-//POM
-//    public void testNodeBuild() {
-//        RuleContentOutlinePage page = new RuleContentOutlinePage( null );
-//        String source = "expander foobar.dsl\nimport foo\nfunction void smeg(s) {\n \n}\n";
-//        PackageTreeNode node = new PackageTreeNode();
-//        page.populatePackageTreeNode( node,
-//                                      source );
-//        Object[] nodes = node.getChildren( new Object() );
-//
-//        for ( int i = 0; i < nodes.length; i++ ) {
-//            if ( nodes[i] instanceof FunctionTreeNode ) {
-//                FunctionTreeNode func = (FunctionTreeNode) nodes[i];
-//                assertEquals( "smeg()",
-//                              func.getLabel( null ) );
-//
-//            }
-//        }
-//
-//        source = "function String foo(String bar) {";
-//        node = new PackageTreeNode();
-//        page.populatePackageTreeNode( node,
-//                                      source );
-//        FunctionTreeNode func = (FunctionTreeNode) node.getChildren( new Object() )[0];
-//        assertEquals( "foo()",
-//                      func.getLabel( null ) );
-//
-//    }
-//
-}

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/DRLCompletionProcessorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/DRLCompletionProcessorTest.java	2007-04-06 01:15:28 UTC (rev 10791)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/DRLCompletionProcessorTest.java	2007-04-06 01:18:53 UTC (rev 10792)
@@ -16,15 +16,13 @@
     }
     
     public void testPrefixFiltering() {
-        DefaultCompletionProcessor proc = new DefaultCompletionProcessor(null);
-
         List list = new ArrayList();
         list.add(new RuleCompletionProposal(0, "aardvark", "something"));
         list.add(new RuleCompletionProposal(0, "smeg"));
         list.add(new RuleCompletionProposal(0, "apple"));
         list.add(new RuleCompletionProposal(0, "ape", "ape"));
         
-        proc.filterProposalsOnPrefix("a", list);
+        DefaultCompletionProcessor.filterProposalsOnPrefix("a", list);
         assertEquals(2, list.size());
         assertEquals("apple", list.get(0).toString());
         assertEquals("ape", list.get(1).toString());
@@ -35,7 +33,7 @@
         list.add(new RuleCompletionProposal(0, "smeg"));
         list.add(new RuleCompletionProposal(0, "apple"));
         list.add(new RuleCompletionProposal(0, "ape", "zzzzz"));
-        proc.filterProposalsOnPrefix("xzyz", list);
+        DefaultCompletionProcessor.filterProposalsOnPrefix("xzyz", list);
         assertEquals(0, list.size());
     }
     

Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/outline/RuleContentOutlineTest.java (from rev 10788, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/RuleContentOutlineTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/outline/RuleContentOutlineTest.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/outline/RuleContentOutlineTest.java	2007-04-06 01:18:53 UTC (rev 10792)
@@ -0,0 +1,41 @@
+package org.drools.eclipse.editors.outline;
+
+import junit.framework.TestCase;
+
+import org.drools.eclipse.core.DroolsElement;
+import org.drools.eclipse.core.Function;
+import org.drools.eclipse.core.Package;
+import org.drools.eclipse.core.RuleSet;
+import org.drools.eclipse.editors.outline.RuleContentOutlinePage;
+
+public class RuleContentOutlineTest extends TestCase {
+
+	public void testNodeBuild() {
+        RuleContentOutlinePage page = new RuleContentOutlinePage( null );
+        String source = "package test;\nexpander foobar.dsl\nimport foo\nfunction void smeg(s) {\n \n}\n";
+        page.populatePackageTreeNode( source );
+        RuleSet ruleSet = page.getRuleSet();
+        Package p = ruleSet.getPackage("test");
+        assertNotNull(p);
+        DroolsElement[] nodes = p.getChildren();
+
+        for ( int i = 0; i < nodes.length; i++ ) {
+            if ( nodes[i] instanceof Function ) {
+                Function func = (Function) nodes[i];
+                assertEquals( "smeg()",
+                              func.getFunctionName() );
+
+            }
+        }
+
+        source = "package test;\n function String foo(String bar) {";
+        page.populatePackageTreeNode( source );
+        p = ruleSet.getPackage("test");
+        assertNotNull(p);
+        Function func = (Function) p.getChildren()[0];
+        assertEquals( "foo()",
+                      func.getFunctionName() );
+
+    }
+
+}

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ReteooLayoutFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ReteooLayoutFactoryTest.java	2007-04-06 01:15:28 UTC (rev 10791)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ReteooLayoutFactoryTest.java	2007-04-06 01:18:53 UTC (rev 10792)
@@ -12,15 +12,21 @@
 
 import org.drools.PackageIntegrationException;
 import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.compiler.DrlParser;
 import org.drools.compiler.DroolsParserException;
+import org.drools.compiler.PackageBuilder;
 import org.drools.eclipse.editors.rete.model.ReteGraph;
+import org.drools.lang.descr.PackageDescr;
 import org.drools.reteoo.AlphaNodeVertex;
 import org.drools.reteoo.BaseVertex;
 import org.drools.reteoo.LeftInputAdapterNodeVertex;
 import org.drools.reteoo.ObjectTypeNodeVertex;
 import org.drools.reteoo.ReteVertex;
+import org.drools.reteoo.ReteooRuleBase;
 import org.drools.reteoo.ReteooVisitor;
-//POM import org.drools.reteoo.TerminalNodeVertex;
+import org.drools.reteoo.RuleTerminalNodeVertex;
+import org.drools.rule.Package;
 
 /**
  * 
@@ -38,177 +44,181 @@
  */
 public class ReteooLayoutFactoryTest extends TestCase {
 
-//POM commenting out for build
-//    /**
-//     * Constructor.
-//     * 
-//     * @param name case name
-//     */
-//    public ReteooLayoutFactoryTest(String name) {
-//        super( name );
-//    }
-//
-//    /**
-//     * Test method for {@link org.drools.eclipse.editors.rete.ReteooLayoutFactory#calculateReteRows(org.drools.reteoo.BaseVertex)}.
-//     * @throws IOException 
-//     * @throws DroolsParserException 
-//     * @throws PackageIntegrationException 
-//     * @throws DroolsParserException 
-//     * @throws PackageIntegrationException 
-//     */
-//    public final void testCalculateReteRows() throws IOException,
-//                                             PackageIntegrationException,
-//                                             DroolsParserException {
-//        ReteGraph graph = new ReteGraph();
-//        BaseVertex root = loadRete( graph );
-//        final RowList rows = ReteooLayoutFactory.calculateReteRows( root );
-//
-//        int rownum = rows.getDepth();
-//
-//        assertEquals( 5,
-//                      rownum );
-//
-//        int[] expectedDepths = new int[]{-1, 0, 1, 2, 3};
-//        int[] expectedSizes = new int[]{1, 1, 2, 2, 2};
-//
-//        for ( int j = 0; j < rownum; j++ ) {
-//            final Row row = rows.get( j );
-//            final int rowDepth = row.getDepth();
-//            assertEquals( expectedDepths[j],
-//                          rowDepth );
-//            assertEquals( expectedSizes[j],
-//                          row.getVertices().size() );
-//        }
-//
-//    }
-//
-//    /**
-//     * Test method for {@link org.drools.eclipse.editors.rete.ReteooLayoutFactory#layoutRowList(org.drools.eclipse.editors.rete.model.ReteGraph, org.drools.eclipse.editors.rete.RowList)}.
-//     * 
-//     * @throws IOException 
-//     * @throws DroolsParserException 
-//     * @throws PackageIntegrationException 
-//     * @throws DroolsParserException 
-//     * @throws PackageIntegrationException 
-//     */
-//    public final void testLayoutRowList() throws IOException,
-//                                         PackageIntegrationException,
-//                                         DroolsParserException {
-//        ReteGraph graph = new ReteGraph();
-//        BaseVertex root = loadRete( graph );
-//        final RowList rows = ReteooLayoutFactory.calculateReteRows( root );
-//
-//        ReteooLayoutFactory.layoutRowList( graph,
-//                                           rows );
-//
-//        final List nodes = graph.getChildren();
-//
-//        BaseVertex[] yOrder = (BaseVertex[]) nodes.toArray( new BaseVertex[0] );
-//        Arrays.sort( yOrder,
-//                     new Comparator() {
-//                         public int compare(Object o1,
-//                                            Object o2) {
-//                             BaseVertex v1 = (BaseVertex) o1;
-//                             BaseVertex v2 = (BaseVertex) o2;
-//                             int y1 = v1.getLocation().y;
-//                             int y2 = v2.getLocation().y;
-//                             return new Integer( y1 ).compareTo( new Integer( y2 ) );
-//                         }
-//
-//                     } );
-//
-//        Class[] expectedTypes = new Class[]{ReteVertex.class, ObjectTypeNodeVertex.class, AlphaNodeVertex.class, AlphaNodeVertex.class, LeftInputAdapterNodeVertex.class, LeftInputAdapterNodeVertex.class, TerminalNodeVertex.class,
-//                TerminalNodeVertex.class};
-//
-//        for ( int i = 0; i < yOrder.length; i++ ) {
-//            assertEquals( expectedTypes[i],
-//                          yOrder[i].getClass() );
-//            if ( i > 0 ) {
-//                // If current vertex has same type as previous then
-//                // y-pos should match and x-pos should not match.                
-//                // If type is different then y-pos should *not* match.
-//
-//                BaseVertex current = yOrder[i];
-//                BaseVertex previous = yOrder[i - 1];
-//                if ( current.getClass().equals( previous.getClass() ) ) {
-//                    assertEquals( current.getLocation().y,
-//                                  previous.getLocation().y );
-//                    assertNotSame( new Integer( current.getLocation().x ),
-//                                   new Integer( previous.getLocation().x ) );
-//                } else {
-//                    assertNotSame( new Integer( current.getLocation().y ),
-//                                   new Integer( previous.getLocation().y ) );
-//                }
-//            }
-//        }
-//
-//    }
-//
-//    private BaseVertex loadRete(ReteGraph graph) throws IOException,
-//                                                PackageIntegrationException,
-//                                                DroolsParserException {
-//        final InputStream is = getClass().getClassLoader().getResourceAsStream( "simplerule.drl" );
-//        String drl = streamToString( is );
-//
-//        final RuleBase ruleBase = ReteViewer.parseRuleBase( drl,
-//                                                            null );
-//
-//        final ReteooVisitor visitor = new ReteooVisitor( graph );
-//        visitor.visit( ruleBase );
-//
-//        BaseVertex root = visitor.getRootVertex();
-//        return root;
-//    }
-//
-//    private String streamToString(InputStream is) throws IOException {
-//        byte[] buffer = new byte[4096];
-//        OutputStream outputStream = new ByteArrayOutputStream();
-//
-//        while ( true ) {
-//            int read = is.read( buffer );
-//
-//            if ( read == -1 ) {
-//                break;
-//            }
-//
-//            outputStream.write( buffer,
-//                                0,
-//                                read );
-//        }
-//
-//        outputStream.close();
-//        is.close();
-//
-//        return outputStream.toString();
-//    }
-//
-//    /**
-//     * Used by simplerule.drl
-//     *
-//     */
-//    public static class Message {
-//        public static final int HELLO   = 0;
-//        public static final int GOODBYE = 1;
-//
-//        private String          message;
-//
-//        private int             status;
-//
-//        public String getMessage() {
-//            return this.message;
-//        }
-//
-//        public void setMessage(final String message) {
-//            this.message = message;
-//        }
-//
-//        public int getStatus() {
-//            return this.status;
-//        }
-//
-//        public void setStatus(final int status) {
-//            this.status = status;
-//        }
-//    }
-//
+    /**
+     * Constructor.
+     * 
+     * @param name case name
+     */
+    public ReteooLayoutFactoryTest(String name) {
+        super( name );
+    }
+
+    /**
+     * Test method for {@link org.drools.eclipse.editors.rete.ReteooLayoutFactory#calculateReteRows(org.drools.reteoo.BaseVertex)}.
+     * @throws IOException 
+     * @throws DroolsParserException 
+     * @throws PackageIntegrationException 
+     * @throws DroolsParserException 
+     * @throws PackageIntegrationException 
+     */
+    public final void testCalculateReteRows() throws IOException,
+                                             PackageIntegrationException,
+                                             DroolsParserException {
+        ReteGraph graph = new ReteGraph();
+        BaseVertex root = loadRete( graph );
+        final RowList rows = ReteooLayoutFactory.calculateReteRows( root );
+
+        int rownum = rows.getDepth();
+
+        assertEquals( 5,
+                      rownum );
+
+        int[] expectedDepths = new int[]{-1, 0, 1, 2, 3};
+        int[] expectedSizes = new int[]{1, 1, 2, 2, 2};
+
+        for ( int j = 0; j < rownum; j++ ) {
+            final Row row = rows.get( j );
+            final int rowDepth = row.getDepth();
+            assertEquals( expectedDepths[j],
+                          rowDepth );
+            assertEquals( expectedSizes[j],
+                          row.getVertices().size() );
+        }
+
+    }
+
+    /**
+     * Test method for {@link org.drools.eclipse.editors.rete.ReteooLayoutFactory#layoutRowList(org.drools.eclipse.editors.rete.model.ReteGraph, org.drools.eclipse.editors.rete.RowList)}.
+     * 
+     * @throws IOException 
+     * @throws DroolsParserException 
+     * @throws PackageIntegrationException 
+     * @throws DroolsParserException 
+     * @throws PackageIntegrationException 
+     */
+    public final void testLayoutRowList() throws IOException,
+                                         PackageIntegrationException,
+                                         DroolsParserException {
+        ReteGraph graph = new ReteGraph();
+        BaseVertex root = loadRete( graph );
+        final RowList rows = ReteooLayoutFactory.calculateReteRows( root );
+
+        ReteooLayoutFactory.layoutRowList( graph,
+                                           rows );
+
+        final List nodes = graph.getChildren();
+
+        BaseVertex[] yOrder = (BaseVertex[]) nodes.toArray( new BaseVertex[0] );
+        Arrays.sort( yOrder,
+                     new Comparator() {
+                         public int compare(Object o1,
+                                            Object o2) {
+                             BaseVertex v1 = (BaseVertex) o1;
+                             BaseVertex v2 = (BaseVertex) o2;
+                             int y1 = v1.getLocation().y;
+                             int y2 = v2.getLocation().y;
+                             return new Integer( y1 ).compareTo( new Integer( y2 ) );
+                         }
+
+                     } );
+
+        Class[] expectedTypes = new Class[]{ReteVertex.class, ObjectTypeNodeVertex.class, AlphaNodeVertex.class, AlphaNodeVertex.class, LeftInputAdapterNodeVertex.class, LeftInputAdapterNodeVertex.class, RuleTerminalNodeVertex.class,
+                RuleTerminalNodeVertex.class};
+
+        for ( int i = 0; i < yOrder.length; i++ ) {
+            assertEquals( expectedTypes[i],
+                          yOrder[i].getClass() );
+            if ( i > 0 ) {
+                // If current vertex has same type as previous then
+                // y-pos should match and x-pos should not match.                
+                // If type is different then y-pos should *not* match.
+
+                BaseVertex current = yOrder[i];
+                BaseVertex previous = yOrder[i - 1];
+                if ( current.getClass().equals( previous.getClass() ) ) {
+                    assertEquals( current.getLocation().y,
+                                  previous.getLocation().y );
+                    assertNotSame( new Integer( current.getLocation().x ),
+                                   new Integer( previous.getLocation().x ) );
+                } else {
+                    assertNotSame( new Integer( current.getLocation().y ),
+                                   new Integer( previous.getLocation().y ) );
+                }
+            }
+        }
+
+    }
+
+    private BaseVertex loadRete(ReteGraph graph) throws IOException,
+                                                PackageIntegrationException,
+                                                DroolsParserException {
+        final InputStream is = getClass().getClassLoader().getResourceAsStream( "simplerule.drl" );
+        String drl = streamToString( is );
+
+        DrlParser parser = new DrlParser();
+        PackageDescr packageDescr = parser.parse(drl);
+        PackageBuilder builder = new PackageBuilder();
+        builder.addPackage(packageDescr);
+        Package pkg = builder.getPackage();
+		ReteooRuleBase ruleBase = (ReteooRuleBase) RuleBaseFactory.newRuleBase(RuleBase.RETEOO);
+		ruleBase.addPackage(pkg);
+
+        final ReteooVisitor visitor = new ReteooVisitor( graph );
+        visitor.visit( ruleBase );
+
+        BaseVertex root = visitor.getRootVertex();
+        return root;
+    }
+
+    private String streamToString(InputStream is) throws IOException {
+        byte[] buffer = new byte[4096];
+        OutputStream outputStream = new ByteArrayOutputStream();
+
+        while ( true ) {
+            int read = is.read( buffer );
+
+            if ( read == -1 ) {
+                break;
+            }
+
+            outputStream.write( buffer,
+                                0,
+                                read );
+        }
+
+        outputStream.close();
+        is.close();
+
+        return outputStream.toString();
+    }
+
+    /**
+     * Used by simplerule.drl
+     *
+     */
+    public static class Message {
+        public static final int HELLO   = 0;
+        public static final int GOODBYE = 1;
+
+        private String          message;
+
+        private int             status;
+
+        public String getMessage() {
+            return this.message;
+        }
+
+        public void setMessage(final String message) {
+            this.message = message;
+        }
+
+        public int getStatus() {
+            return this.status;
+        }
+
+        public void setStatus(final int status) {
+            this.status = status;
+        }
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java	2007-04-06 01:15:28 UTC (rev 10791)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/rete/ZoomControlTest.java	2007-04-06 01:18:53 UTC (rev 10792)
@@ -1,7 +1,7 @@
 package org.drools.eclipse.editors.rete;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.StringBufferInputStream;
 
 import junit.framework.TestCase;
 
@@ -84,61 +84,61 @@
         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 );
 
-        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 {
@@ -148,21 +148,21 @@
 
         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 );
 
-        // 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,
@@ -198,7 +198,7 @@
                              String name,
                              String contents) throws CoreException {
         IFile file = folder.getFile( name );
-        InputStream inputStream = new StringBufferInputStream( contents );
+        InputStream inputStream = new ByteArrayInputStream( contents.getBytes() );
         file.create( inputStream,
                      true,
                      NULL_MONITOR );

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/resources/simplerule.drl
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/resources/simplerule.drl	2007-04-06 01:15:28 UTC (rev 10791)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/resources/simplerule.drl	2007-04-06 01:18:53 UTC (rev 10792)
@@ -2,7 +2,7 @@
 
 // Rules for ReteooLayoutFactoryTest
 
-import org.drools.ide.editors.rete.ReteooLayoutFactoryTest.Message;
+import org.drools.eclipse.editors.rete.ReteooLayoutFactoryTest.Message;
 
 rule "Hello World"
         when




More information about the jboss-svn-commits mailing list