1.1 --- a/src/java-tests/isac/util/parser/TestXMLParserDigest.java	Fri Jun 24 09:58:14 2005 +0200
     1.2 +++ b/src/java-tests/isac/util/parser/TestXMLParserDigest.java	Fri Jun 24 10:23:12 2005 +0200
     1.3 @@ -141,10 +141,10 @@
     1.4          assertEquals(chead.getHeadLine().toSMLString(),
     1.5                  "solve (1 + -1 * 2 + x = 0, x)");
     1.6  
     1.7 -        assertEquals(chead.getWhere().getItems().elementAt(0).toString(),
     1.8 -                "false matches (v_ = 0) e_");
     1.9 -        assertEquals(((ModelItem) chead.getWhere().getItems().elementAt(0))
    1.10 -                .getStatus(), 5);//.."false"
    1.11 +        assertEquals(chead.getModel().getWhere().getItems().elementAt(0)
    1.12 +                .toString(), "false matches (v_ = 0) e_");
    1.13 +        assertEquals(((ModelItem) chead.getModel().getWhere().getItems()
    1.14 +                .elementAt(0)).getStatus(), 5);//.."false"
    1.15      }
    1.16  
    1.17      public void testParseRefCalcHeadT() throws Exception {
    1.18 @@ -231,15 +231,15 @@
    1.19          assertEquals(chead.getPosition().toSMLString(), "([3],Pbl)");
    1.20          assertEquals(chead.getHeadLine().toSMLString(), "solve (-1 + x = 0, x)");
    1.21  
    1.22 -        assertEquals(chead.getGiven().getItems().elementAt(0).toString(),
    1.23 -                "correct equality (-1 + x = 0)");
    1.24 -        assertEquals(chead.getGiven().getItems().elementAt(1).toString(),
    1.25 -                "correct solveFor x");
    1.26 +        assertEquals(chead.getModel().getGiven().getItems().elementAt(0)
    1.27 +                .toString(), "correct equality (-1 + x = 0)");
    1.28 +        assertEquals(chead.getModel().getGiven().getItems().elementAt(1)
    1.29 +                .toString(), "correct solveFor x");
    1.30  
    1.31 -        assertEquals(((ModelItem) chead.getGiven().getItems().elementAt(0))
    1.32 -                .getStatus(), 1);//.."correct"
    1.33 -        assertEquals(((ModelItem) chead.getGiven().getItems().elementAt(1))
    1.34 -                .getStatus(), 1);//.."correct"
    1.35 +        assertEquals(((ModelItem) chead.getModel().getGiven().getItems()
    1.36 +                .elementAt(0)).getStatus(), 1);//.."correct"
    1.37 +        assertEquals(((ModelItem) chead.getModel().getGiven().getItems()
    1.38 +                .elementAt(1)).getStatus(), 1);//.."correct"
    1.39      }
    1.40  
    1.41      public void testParseCalcChanged() throws RemoteException {