Changeset 1823 for trunk

Timestamp:

09/22/13 23:36:58 (11 years ago)

Author:

masberg

Message:

This test was disabled because it had suffered severe bit-rot. Update test to use new sorting APIs. Formatting fixes. Fix typos.

File:

• trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestModelicaElementSorter.java (modified) (5 diffs)

trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestModelicaElementSorter.java

@@ -42 +42 @@
 package org.modelica.mdt.test;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -47 +50 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.junit.Before;
+import org.junit.Test;
 import org.modelica.mdt.core.IModelicaClass;
-import org.modelica.mdt.core.IModelicaSourceFile;
 import org.modelica.mdt.core.IModelicaFolder;
 import org.modelica.mdt.core.IModelicaProject;
+import org.modelica.mdt.core.IModelicaSourceFile;
 import org.modelica.mdt.core.compiler.CompilerInstantiationException;
 import org.modelica.mdt.core.compiler.ConnectException;
@@ -57 +62 @@
 import org.modelica.mdt.test.util.Area51Projects;
 import org.modelica.mdt.test.util.Utility;
-//import org.modelica.mdt.ui.ModelicaElementSorter;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.modelica.mdt.ui.ModelicaElementComparator;
 
 /**
@@ -67 +69 @@
 public class TestModelicaElementSorter {
 
-    /* the test subject */
-    //private ModelicaElementSorter sorter = new ModelicaElementSorter(ModelicaElementSorter.NAME);
-    
-    @org.junit.Before
-    public void setUp() throws Exception {
+    @Before
+    public void setUp() {
         Area51Projects.createProjects();
     }
 
-    // We disable this test for now, because it wants to use functionality that has been removed from MDT.
-    //@org.junit.Test
+    @Test
     public void testSorter()
         throws ConnectException, UnexpectedReplyException, InvocationError, CoreException, CompilerInstantiationException {
         /*
          * let the sorter sort children elements of Area51 modelica project
-         * and check the order 
-         */
-        IModelicaProject proj = 
-            Utility.getProject(Area51Projects.MODELICA_PROJECT_NAME);
-        
+         * and check the order
+         */
+        IModelicaProject proj = Utility.getProject(Area51Projects.MODELICA_PROJECT_NAME);
+
         Object[] children = proj.getRootFolder().getChildren().toArray();
-        
+
         /*
          * we need to create a viewer and set a label provider,
          * for the sorter. sorter uses label provider for sorting elements
-         * within catagory
+         * within a category
          */
         TreeViewer viewer = new TreeViewer(new Shell());
@@ -99 +96 @@
          * let the sorter do the sorting
          */
-         
-        //sorter.sort(viewer, children);
-        
+        ModelicaElementComparator sorter = new ModelicaElementComparator(ModelicaElementComparator.MODELICA);
+        sorter.sort(viewer, children);
+
         int i = 0;
         int order;
         String previous = null;
         String current;
-        Object elm;
-        
-        /* check folders catagory */
-        for (; i < children.length; i++)
-        {
-            elm = children[i];
-            
-            if (elm instanceof IModelicaFolder && 
-                    !(elm instanceof IModelicaClass))
-            {
-                current = ((IModelicaFolder)elm).getElementName();
-                if (previous != null)
-                {
-                    order = 
-                        String.CASE_INSENSITIVE_ORDER.compare(previous, 
-                                current);
-                    
-                    assertTrue("element are not in assending order",
-                            order <= 0 );
-                }
-                previous = current;
-            }
-            else 
-            {
-                /* next catagory begun */
-                previous = null;
-                break;
-            }
-        }
-        
-        /* check packages catagory */
-        for (; i < children.length; i++)
-        {
-            elm = children[i];
-            
-            if (elm instanceof IModelicaClass)
-            {
-                current = ((IModelicaClass)elm).getElementName();
-                if (previous != null)
-                {
-                    order = 
-                        String.CASE_INSENSITIVE_ORDER.compare(previous, 
-                                current);
-                    
-                    assertTrue("element are not in assending order",
-                            order <= 0 );
-                }
-                previous = current;
-            }
-            else if (elm instanceof IModelicaFolder)
-            {
+
+        /* check folders category */
+        for (; i < children.length; i++) {
+            Object elm = children[i];
+            if (elm instanceof IModelicaFolder) {
+                IModelicaFolder modelicaFolder = (IModelicaFolder)elm;
+                current = modelicaFolder.getElementName();
+                if (previous != null) {
+                    order = String.CASE_INSENSITIVE_ORDER.compare(previous, current);
+
+                    assertTrue("folder elements are not in assending order", order <= 0);
+                }
+                previous = current;
+            }
+            else {
+                /* next category begun */
+                previous = null;
+                break;
+            }
+        }
+
+        /* check packages category */
+        for (; i < children.length; i++) {
+            Object elm = children[i];
+            if (elm instanceof IModelicaClass) {
+                IModelicaClass modelicaClass = (IModelicaClass)elm;
+                current = modelicaClass.getElementName();
+                if (previous != null) {
+                    order = String.CASE_INSENSITIVE_ORDER.compare(previous, current);
+
+                    assertTrue("class elements are not in assending order", order <= 0);
+                }
+                previous = current;
+            }
+            else if (elm instanceof IModelicaFolder) {
                 fail("modelica folder in the wrong place");
             }
-
-            else
-            {
-                /* next catagory begun */
-                previous = null;
-                break;
-            }
-        }
-        
+            else {
+                /* next category begun */
+                previous = null;
+                break;
+            }
+        }
+
         /*
          * we don't have a class category in this test case
          */
-        
-        /* check modelica files catagory */
-        for (; i < children.length; i++)
-        {
-            elm = children[i];
-            
-            if (elm instanceof IModelicaSourceFile)
-            {
-                current = ((IModelicaSourceFile)elm).getElementName();
-                if (previous != null)
-                {
-                    order = 
-                        String.CASE_INSENSITIVE_ORDER.compare(previous, 
-                                current);
-                    
-                    assertTrue("element are not in assending order",
-                            order <= 0 );
-                }
-                previous = current;
-            }
-            else if (elm instanceof IModelicaFolder)
-            {
+
+        /* check modelica files category */
+        for (; i < children.length; i++) {
+            Object elm = children[i];
+            if (elm instanceof IModelicaSourceFile) {
+                IModelicaSourceFile modelicaSourceFile = (IModelicaSourceFile)elm;
+                current = modelicaSourceFile.getElementName();
+                if (previous != null) {
+                    order = String.CASE_INSENSITIVE_ORDER.compare(previous, current);
+
+                    assertTrue("sourcefile elements are not in assending order", order <= 0);
+                }
+                previous = current;
+            }
+            else if (elm instanceof IModelicaFolder) {
                 fail("modelica folder/package in the wrong place");
             }
-            else if (elm instanceof IModelicaClass)
-            {
+            else if (elm instanceof IModelicaClass) {
                 fail("modelica class in the wrong place");
             }
-            else
-            {
-                /* next catagory begun */
-                previous = null;
-                break;
-            }
-        }
-        
-        /* check plain files catagory */
-        for (; i < children.length; i++)
-        {
-            elm = children[i];
-            
-            if (elm instanceof IFile)
-            {
-                current = ((IFile)elm).getName();
-                if (previous != null)
-                {
-                    order = 
-                        String.CASE_INSENSITIVE_ORDER.compare(previous, 
-                                current);
-                    
-                    assertTrue("element are not in assending order",
-                            order <= 0 );
-                }
-                previous = current;
-            }
-            else if (elm instanceof IModelicaFolder)
-            {
+            else {
+                /* next category begun */
+                previous = null;
+                break;
+            }
+        }
+
+        /* check plain files category */
+        for (; i < children.length; i++) {
+            Object elm = children[i];
+            if (elm instanceof IFile) {
+                IFile file = (IFile)elm;
+                current = file.getName();
+                if (previous != null) {
+                    order = String.CASE_INSENSITIVE_ORDER.compare(previous, current);
+
+                    assertTrue("file elements are not in assending order", order <= 0);
+                }
+                previous = current;
+            }
+            else if (elm instanceof IModelicaFolder) {
                 fail("modelica folder/package in the wrong place");
             }
-            else if (elm instanceof IModelicaClass)
-            {
+            else if (elm instanceof IModelicaClass) {
                 fail("modelica class in the wrong place");
             }
-            else if (elm instanceof IModelicaSourceFile)
-            {
+            else if (elm instanceof IModelicaSourceFile) {
                 fail("modelica class in the wrong place");
             }
-            else
-            {
-                /* next catagory begun */
-                previous = null;
-                break;
-            }
-        }
-
-        /*
-         * we don't have a system library catagory in this test case
+            else {
+                /* next category begun */
+                previous = null;
+                break;
+            }
+        }
+
+        /*
+         * we don't have a system library category in this test case
          */
     }