Changeset 1069 for trunk/org.modelica.mdt.test

Timestamp:

11/01/11 23:20:13 (13 years ago)

Author:

masberg

Message:

Additional cleanups, clearer error messages.

File:

• trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestModelicaProject.java (modified) (10 diffs)

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

@@ -95 +95 @@
                 "components_bananza",
                 "nested_models",
-                "childless_package",                
+                "childless_package",
                 "import_rich_model",
-                "folder_package",               
+                "folder_package",
                 "hepp",
                 "muu",
@@ -107 +107 @@
      */
     @Test
-    public void testGetClass() 
+    public void testGetClass()
             throws ConnectException, CompilerInstantiationException, UnexpectedReplyException, InvocationError, CoreException, Exception {
         /*
@@ -136 +136 @@
         testGetClass("components_bananza.a_class", "components_bananza.a_class", IModelicaClass.Restriction.CLASS);
 
-        testGetClass("components_bananza.a_type", "components_bananza.a_type", IModelicaClass.Restriction.TYPE);    
+        testGetClass("components_bananza.a_type", "components_bananza.a_type", IModelicaClass.Restriction.TYPE);
 
         testGetClass("components_bananza.a_connector", "components_bananza.a_connector", IModelicaClass.Restriction.CONNECTOR);
@@ -231 +231 @@
         }
 
-        String errorMsg = "could not find following expeced root classes:";
+        String errorMsg = "Could not find following expected root classes:";
         for (String cls : expectedRootPackages) {
             errorMsg += " " + cls;
@@ -251 +251 @@
         testFindElement("package_look_alike", IModelicaFolder.class, null);
 
-        /* 
+        /*
          * FIXME: We are currently not creating the empty file package.mo inside package_look_alike
          * because it makes OMC to freeze. When this problem has been fixed, we can run this test
@@ -294 +294 @@
         testFindElement("root_model.mo", IModelicaSourceFile.class, null);
 
-        testFindElement("empty_file", IModelicaFile.class, null);   
+        testFindElement("empty_file", IModelicaFile.class, null);
 
         testFindElement("README.txt", IModelicaFile.class, null);
@@ -300 +300 @@
         /*
          * check what happens when trying to find non-existing elements
-         * 
+         *
          * BEWARE, the test below can break if elements search for are added
          * to the area51 modelica project
@@ -307 +307 @@
 
         testFindElementNonExisting("packages_folder/file_package.mo/file_package2");
-        
+
         testFindElementNonExisting("non_existing_file");
 
@@ -325 +325 @@
     }
 
-    private void testGetClass(String className, String expectedFullName, IModelicaClass.Restriction expectedRestriction) throws Exception {
+    private void testGetClass(String className, String expectedFullName, IModelicaClass.Restriction expectedRestriction)
+            throws ConnectException, CompilerInstantiationException, UnexpectedReplyException, InvocationError, CoreException {
         IModelicaClass pkg = project.getClass(className);
 
@@ -332 +333 @@
         }
 
-        assertNotNull("project.getClass() returned null for \"" + className + "\"", pkg);
+        String getClassFail = "project.getClass() returned null for className \"" + className + "\".";
+
+        assertNotNull(getClassFail, pkg);
 
         String actualFullName = pkg.getFullName();
-
-        assertEquals("Expected pkg.getFullName() to return \"" + expectedFullName + "\" for className \"" + className + "\", but got \"" + actualFullName + "\".", expectedFullName, actualFullName);
+        String fullNameFail = "Expected pkg.getFullName() to return \"" + expectedFullName + "\" for className \"" + className +
+                "\", but got \"" + actualFullName + "\".";
+
+        assertEquals(fullNameFail, expectedFullName, actualFullName);
 
         IModelicaClass.Restriction actualRestriction = pkg.getRestriction();
-
-        assertEquals("Expected restriction " + expectedRestriction + ", but got " + actualRestriction + ".", expectedRestriction, actualRestriction);
+        String restrictionFail = "For className \"" + className + "\", the expected restriction was \"" + expectedRestriction +
+                "\", but we got \"" + actualRestriction + "\".";
+
+        assertEquals(restrictionFail, expectedRestriction, actualRestriction);
     }
 
     private void testGetClassNonExisting(String className) throws Exception {
         IModelicaClass pkg = project.getClass(className);
-
-        assertNull("project.getClass() was called with \"" + className + "\", and was expected to return NULL, but didn't.", pkg);
-    }
-    
+        String getClassNonExistingFail = "project.getClass() was called with className \"" + className +
+                "\", and was expected to return NULL, but didn't.";
+
+        assertNull(getClassNonExistingFail, pkg);
+    }
+
     private void testFindElement(String pathName, Class<?> expectedClass, IModelicaClass.Restriction expectedRestriction)
             throws ConnectException, UnexpectedReplyException, CompilerInstantiationException, InvocationError, CoreException {
         Path path = new Path(pathName);
         IModelicaElement element = project.findElement(path);
-        
-        assertNotNull(element);
-        
+        String findElementFail = "project.findElement() returned null for pathName \"" + pathName + "\".";
+
+        assertNotNull(findElementFail, element);
+
         Class<?> actualClass = element.getClass();
         String expectedClassName = expectedClass.getCanonicalName();
         String actualClassName = actualClass.getCanonicalName();
-        String errorMsgClass = "Was expecting " + expectedClassName + ", but got " + actualClassName;
-        
+        String errorMsgClass = "For pathName \"" + pathName + "\", we expected to find an element that is an instance of \"" +
+                expectedClassName + "\", but the returned class \"" + actualClassName + "\" is not an instance of that class.";
+
         assertTrue(errorMsgClass, expectedClass.isAssignableFrom(actualClass));
-        
+
         if (expectedRestriction != null) {
-            assertTrue(element instanceof IModelicaClass);
+            String typeFail = "Since a restriction \"" + expectedRestriction + "\" was specified for pathName \"" +
+                    pathName + "\", it was expected to be an instance of IModelicaClass, but it was not.";
+
+            assertTrue(typeFail, element instanceof IModelicaClass);
+
             IModelicaClass.Restriction actualRestriction = ((IModelicaClass)element).getRestriction();
-            
-            assertEquals("Expected restriction " + expectedRestriction + ", but got " + actualRestriction + ".", expectedRestriction, actualRestriction);
+            String restrictionFail = "For pathName \"" + pathName + "\", the expected restriction was \"" + expectedRestriction
+                    + "\", but we got \"" + actualRestriction + "\".";
+
+            assertEquals(restrictionFail, expectedRestriction, actualRestriction);
         }
     }
-    
-    private void testFindElementNonExisting(String pathName) 
+
+    private void testFindElementNonExisting(String pathName)
             throws ConnectException, UnexpectedReplyException, CompilerInstantiationException, InvocationError, CoreException {
         Path path = new Path(pathName);
         IModelicaElement element = project.findElement(path);
-        assertNull(element);
-    }
-
-    private void printAll(Collection<? extends IModelicaElement> children, int indent) throws Exception {       
+        String findElementNonExistingFail = "project.findElement() was called with pathName \"" + pathName +
+                "\", and was expected to return NULL, but didn't.";
+
+        assertNull(findElementNonExistingFail, element);
+    }
+
+    private void printAll(Collection<? extends IModelicaElement> children, int indent)
+            throws ConnectException, UnexpectedReplyException, InvocationError, CompilerInstantiationException, CoreException {
         for (IModelicaElement elem : children) {
             for (int i = 0; i < indent; i++) System.out.print("  ");