1.1 --- a/isac-java/src/java-tests/isac/bridge/xml/TestDataTypes.java	Mon Aug 03 08:07:05 2015 +0200
     1.2 +++ b/isac-java/src/java-tests/isac/bridge/xml/TestDataTypes.java	Mon Aug 03 14:28:39 2015 +0200
     1.3 @@ -99,6 +99,24 @@
     1.4          //# 6  --ref_formula_out: CALCHEAD before
     1.5          //11 xml_to_CalcHead before: new CalcHead
     1.6          /////////////////////////////////////////
     1.7 +        // asserts after successful tackling error bottom up below:
     1.8 +        CalcHead ch = (CalcHead)(calcid_formhead.getFormHead());
     1.9 +        assertEquals(ch.getPosition().toSMLString(), "([],Pbl)");
    1.10 +        assertEquals(ch.getHeadLine().toSMLString(), "solve (x + 1 = 2, x)");
    1.11 +
    1.12 +        Model model = ch.getModel();
    1.13 +        assertEquals(model.getGiven().getItems().size(), 0);
    1.14 +        assertEquals(model.getWhere().getItems().size(), 1);
    1.15 +        assertEquals(((ModelItem)model.getWhere().getItems().elementAt(0)).getItemStatus(), "false");
    1.16 +        assertEquals(((ModelItem)model.getWhere().getItems().elementAt(0)).toSMLString(), "precond_rootpbl v_v");
    1.17 +
    1.18 +        assertEquals(ch.getBelongsTo(), "Pbl");
    1.19 +
    1.20 +        Specification spec = ch.getSpecification();
    1.21 +        assertEquals(spec.getTheory().toString(), "e_domID\n");
    1.22 +        assertEquals(spec.getProblem().toSMLString(), "[\"e_pblID\"]");
    1.23 +        assertEquals(spec.getMethod().toSMLString(), "[\"e_metID\"]");
    1.24 +
    1.25          
    1.26          ///-------------------------------------------------------------------
    1.27          // follow scala code in IsaToJava.xml_to_Specification as close as possible
    1.28 @@ -120,7 +138,7 @@
    1.29          //create Model bottom up ...
    1.30          XML.Tree xml_model = TestDataTypesDATA.create_xml_model(REF_FORMULA_out);
    1.31          System.out.println("xml_model (created in Scala) = " + xml_model);
    1.32 -        /*ERROR*/ Model model = IsaToJava.xml_to_Model(xml_model);
    1.33 +        /*ERROR*/ model = IsaToJava.xml_to_Model(xml_model);
    1.34  
    1.35          Vector<ModelItem> givens = model.getGiven().getItems();
    1.36          assertEquals(givens.size(), 0);
    1.37 @@ -153,7 +171,7 @@
    1.38          
    1.39          //--------- Specification ------------------------------
    1.40          XML.Tree xml_spec = TestDataTypesDATA.create_xml_spec(REF_FORMULA_out);
    1.41 -        /*ERROR*/ Specification spec = IsaToJava.xml_to_Specification(xml_spec);
    1.42 +        /*ERROR*/ spec = IsaToJava.xml_to_Specification(xml_spec);
    1.43  
    1.44          System.out.println("\\--END isac.bridge.DataTypes#testCalcHead");
    1.45      }