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

Timestamp:

03/17/06 10:13:30 (19 years ago)

Author:

remar

Message:

• parser now understands strings and doesn't try to parse contents of 'em
• elmir was really tired when he did the test for the parser, so it's been fixed

File:

• trunk/org.modelica.mdt.test/src/org/modelica/mdt/test/TestModelicaParser.java (modified) (4 diffs)

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

@@ -142 +142 @@
 
     private static final String GET_CLASS_INFO1 = 
-        "{\"model\"," +
-        "\"Chua's circuit, ns, V, A\"," +
-        "C:\\OpenModelica132\\ModelicaLibrary\\Modelica\\Electrical\\Anal" +
-        "og\\Examples\\ChuaCircuit.mo\"," +
-        "{false,false,true}," +
-        "{\"writable\",1,1,65,16}}";
-
+    "{\"model\",\"Chua's circuit, ns, V, A\",\"/home/x05andre/ex/Modelica " +
+    "Library/Modelica/Electrical/Analog/Examples/ChuaCircuit.mo\",{false,f" +
+    "alse,true},{\"writable\",1,1,65,16}}";
     /*
      * The expected results when getElements() output is parsed 
@@ -414 +410 @@
 
         parsedList = ModelicaParser.parseList(GET_CLASS_INFO1);
-        
-        assertEquals("parse resuls if of wrong length", 4, parsedList.size());
+
+        assertEquals("Parse resuls is of wrong length", 5, parsedList.size());
         
         listElement = parsedList.elementAt(0);
-        assertTrue("expected simple element found list",
-                listElement instanceof Element);
-        assertEquals("wrong string", "\"model\"",
+        assertTrue("Expected simple element found list",
+                listElement instanceof Element);
+        assertEquals("Wrong string", "\"model\"",
                 ((Element)listElement).toString());
 
@@ -426 +422 @@
         assertTrue("expected simple element found list",
                 listElement instanceof Element);
-        assertEquals("wrong string",
-                "Chua's circuit, ns, V, A\",\"C:\\OpenModelica132\\Modelica" +
-                "Library\\Modelica\\Electrical\\Analog\\Examples\\ChuaCircuit.mo",
-                ((Element)listElement).toString());
-
+        assertEquals("Wrong string",
+                "\"Chua's circuit, ns, V, A\"",
+                ((Element)listElement).toString());
         
         listElement = parsedList.elementAt(2);
-        assertTrue("expected list found simple element",
-                listElement instanceof List);
-        list = (List)listElement;
-        
-        assertEquals("parse resuls if of wrong length", 3, parsedList.size());
-        
-        listElement = list.elementAt(0);
-        assertTrue("expected simple element found list",
-                listElement instanceof Element);
-        assertEquals("wrong string", "false",
-                ((Element)listElement).toString());
-        
-        listElement = list.elementAt(1);
-        assertTrue("expected simple element found list",
-                listElement instanceof Element);
-        assertEquals("wrong string", "false",
-                ((Element)listElement).toString());
-        
-        listElement = list.elementAt(2);
-        assertTrue("expected simple element found list",
-                listElement instanceof Element);
-        assertEquals("wrong string", "true",
-                ((Element)listElement).toString());
-
-
+        assertTrue("Expected simple element found list",
+                listElement instanceof Element);
+        assertEquals("Wrong string",
+                "\"/home/x05andre/ex/Modelica Library/Modelica/Electrical/Anal" +
+                "og/Examples/ChuaCircuit.mo\"",
+                ((Element)listElement).toString());
+        
         listElement = parsedList.elementAt(3);
         assertTrue("expected list found simple element",
@@ -463 +439 @@
         list = (List)listElement;
         
-        assertEquals("parse resuls if of wrong length", 5, parsedList.size());
+        assertEquals("parse resuls if of wrong length", 3, list.size());
         
         listElement = list.elementAt(0);
         assertTrue("expected simple element found list",
                 listElement instanceof Element);
-        assertEquals("wrong string", "writeable",
+        assertEquals("wrong string", "false",
+                ((Element)listElement).toString());
+        
+        listElement = list.elementAt(1);
+        assertTrue("expected simple element found list",
+                listElement instanceof Element);
+        assertEquals("wrong string", "false",
+                ((Element)listElement).toString());
+        
+        listElement = list.elementAt(2);
+        assertTrue("expected simple element found list",
+                listElement instanceof Element);
+        assertEquals("wrong string", "true",
+                ((Element)listElement).toString());
+
+
+        listElement = parsedList.elementAt(4);
+        assertTrue("expected list found simple element",
+                listElement instanceof List);
+        list = (List)listElement;
+        
+        assertEquals("parse resuls if of wrong length", 5, list.size());
+        
+        listElement = list.elementAt(0);
+        assertTrue("expected simple element found list",
+                listElement instanceof Element);
+        assertEquals("wrong string", "\"writable\"",
                 ((Element)listElement).toString());