Fix tests for multiline prints

Author: mmatera

mathics/builtin/assignment.py

@@ -864,36 +864,51 @@ class Information(PrefixOperator):
     #> a = 2;
     #> Information[a]
      | a = 2
-    #> f[x_] := x ^ 2
-    #> g[f] ^:= 2
+     .
+     = Null
+
+    #> f[x_] := x ^ 2;
+    #> g[f] ^:= 2;
     #> f::usage = "f[x] returns the square of x";
     #> Information[f]
      | f[x] returns the square of x
+     .
+     . f[x_] = x ^ 2
+     .
+     . g[f] ^= 2
+     .
+     = Null
+
 
     #> ? Table
-     |   'Table[expr, {i, n}]'
-     |     evaluates expr with i ranging from 1 to n, returning
-     | a list of the results.
-     |   'Table[expr, {i, start, stop, step}]'
-     |     evaluates expr with i ranging from start to stop,
-     | incrementing by step.
-     |   'Table[expr, {i, {e1, e2, ..., ei}}]'
-     |     evaluates expr with i taking on the values e1, e2,
-     | ..., ei.
+     | 
+     .   'Table[expr, {i, n}]'
+     .     evaluates expr with i ranging from 1 to n, returning
+     . a list of the results.
+     .   'Table[expr, {i, start, stop, step}]'
+     .     evaluates expr with i ranging from start to stop,
+     . incrementing by step.
+     .   'Table[expr, {i, {e1, e2, ..., ei}}]'
+     .     evaluates expr with i taking on the values e1, e2,
+     . ..., ei.
+     .
+     = Null
 
     #> Information[Table]
-     |   'Table[expr, {i, n}]'
-     |     evaluates expr with i ranging from 1 to n, returning
-     | a list of the results.
-     |   'Table[expr, {i, start, stop, step}]'
-     |     evaluates expr with i ranging from start to stop,
-     | incrementing by step.
-     |   'Table[expr, {i, {e1, e2, ..., ei}}]'
-     |     evaluates expr with i taking on the values e1, e2,
-     | ..., ei.
-     |
-     | Attributes[Table] = {HoldAll, Protected}
-     |
+     | 
+     .   'Table[expr, {i, n}]'
+     .     evaluates expr with i ranging from 1 to n, returning
+     . a list of the results.
+     .   'Table[expr, {i, start, stop, step}]'
+     .     evaluates expr with i ranging from start to stop,
+     . incrementing by step.
+     .   'Table[expr, {i, {e1, e2, ..., ei}}]'
+     .     evaluates expr with i taking on the values e1, e2,
+     . ..., ei.
+     .
+     . Attributes[Table] = {HoldAll, Protected}
+     .
+     = Null
     """
 
     operator = "??"
@@ -904,7 +919,7 @@ class Information(PrefixOperator):
 
     def format_definition(self, symbol, evaluation, options, grid=True):
         'StandardForm,TraditionalForm,OutputForm: Information[symbol_, OptionsPattern[Information]]'
-        ret = Symbol("Null")
+        ret = Symbol('Null')
         lines = []
         if isinstance(symbol, String):
             evaluation.print_out(symbol)

mathics/builtin/inout.py

@@ -1897,6 +1897,9 @@ class Print(Builtin):
      | μ
     #> Print["μ"]
      | μ
+    #> Print["-Hola\\n-Qué tal?"]
+     | -Hola
+     . -Qué tal?
     """
 
     def apply(self, expr, evaluation):

mathics/doc/doc.py

@@ -1143,7 +1143,6 @@ class DocTest(object):
       `|`  Prints output.
     """
     def __init__(self, index, testcase):
-
         def strip_sentinal(line):
             """Remove END_LINE_SENTINAL from the end of a line if it appears.
 
@@ -1192,20 +1191,21 @@ def strip_sentinal(line):
                     if self.result is not None:
                         self.result += text
                     elif self.outs:
-                        self.outs[-1] += text
+                        self.outs[-1].text += text
                     continue
-
+                
                 match = TESTCASE_OUT_RE.match(line)
                 symbol, text = match.group(1), match.group(2)
                 text = text.strip()
                 if symbol == '=':
                     self.result = text
-                elif text:
-                    if symbol == ':':
-                        out = Message('', '', text)
-                    elif symbol == '|':
-                        out = Print(text)
-                    self.outs.append(out)
+                elif symbol == ':':
+                    out = Message('', '', text)
+                    self.outs.append(out)                    
+                elif symbol == '|':
+                    out = Print(text)
+                    self.outs.append(out)                    
+
 
     def __str__(self):
         return self.test

mathics/test.py

@@ -90,8 +90,19 @@ def fail(why):
         info = sys.exc_info()
         sys.excepthook(*info)
         return False
-
+    if False:
+        print("out=-----------------")
+        for rr in out:
+            for line in rr.text.splitlines():
+                print("  <",line,">")
+        print("wanted_out=-------------------")
+        for rr in wanted_out:
+            for line in rr.text.splitlines():
+                print("  <",line,">")
+        print("---------------------------------")
+    
     if not compare(result, wanted):
+        print("result =!=wanted")
         fail_msg = "Result: %s\nWanted: %s" % (result, wanted)
         if out:
             fail_msg += "\nAdditional output:\n"
@@ -102,6 +113,8 @@ def fail(why):
         output_ok = False
     else:
         for got, wanted in zip(out, wanted_out):
+            if False:
+                print("got=<",got,"> wanted=<",wanted,">")
             if not got == wanted:
                 output_ok = False
                 break