From 2ee5bbf468ee90c0b5b6d7b5cdef7919ebbc3d5d Mon Sep 17 00:00:00 2001
From: Dima Pasechnik <dimpase@gmail.com>
Date: Thu, 11 Aug 2016 22:59:15 +0100
Subject: [PATCH] doctests fixes, except fricas(1/2).sage() in axiom.py

---
 src/sage/interfaces/axiom.py              | 4 ++--
 src/sage/rings/infinity.py                | 2 +-
 src/sage/rings/real_mpfr.pyx              | 2 +-
 src/sage/symbolic/integration/external.py | 4 ++--
 src/sage/symbolic/integration/integral.py | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/sage/interfaces/axiom.py b/src/sage/interfaces/axiom.py
index 32012f7661b..a34f4ac6f76 100644
--- a/src/sage/interfaces/axiom.py
+++ b/src/sage/interfaces/axiom.py
@@ -430,9 +430,9 @@ def _eval_line(self, line, reformat=True, allow_use_file=False,
             sage: print(fricas._eval_line("2+2"))  # optional - fricas
             $$
             4 
-            \leqno(11)
+            \leqno(3)
             $$
-                                                       Type: PositiveInteger
+                                                                                                                                                                                                                                    Type: PositiveInteger
             sage: fricas._eval_line(")set output tex off")  #optional - fricas
             ''
             sage: fricas._eval_line(")set output algebra on")  #optional - fricas
diff --git a/src/sage/rings/infinity.py b/src/sage/rings/infinity.py
index 3b043a575d6..252c8d1ede7 100644
--- a/src/sage/rings/infinity.py
+++ b/src/sage/rings/infinity.py
@@ -283,7 +283,7 @@ def _fricas_init_(self):
         TESTS::
 
             sage: fricas(-oo)           # optional - fricas
-            %minusInfinity
+            - infinity
             sage: [x._fricas_init_() for x in [unsigned_infinity, oo, -oo]]   # optional - fricas
             ['%infinity', '%plusInfinity', '%minusInfinity']
         """
diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx
index ce2864ef499..9d39f73f758 100644
--- a/src/sage/rings/real_mpfr.pyx
+++ b/src/sage/rings/real_mpfr.pyx
@@ -3032,7 +3032,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
             sage: axiom(R(pi))  # optional - axiom # indirect doctest
             3.1415926535 8979323846 26433833
             sage: fricas(R(pi)) # optional - fricas
-            3.1415926535 8979323846 26433833
+            3.1415926535_8979323846_26433833
 
         """
         prec = self.parent().prec()
diff --git a/src/sage/symbolic/integration/external.py b/src/sage/symbolic/integration/external.py
index 044ff0b3ab3..fab55e38727 100644
--- a/src/sage/symbolic/integration/external.py
+++ b/src/sage/symbolic/integration/external.py
@@ -88,9 +88,9 @@ def fricas_integrator(expression, v, a=None, b=None):
         sage: fricas_integrator(cos(x), x)                                      # optional - fricas
         sin(x)
         sage: fricas_integrator(1/(x^2-2), x, 0, 1)                             # optional - fricas
-        1/4*(log(3*sqrt(2) - 4) - log(sqrt(2)))*sqrt(2)
+        1/4*sqrt(2)*(log(3*sqrt(2) - 4) - log(sqrt(2)))
         sage: fricas_integrator(1/(x^2+6), x, -oo, oo)                          # optional - fricas
-        1/6*pi*sqrt(6)
+        1/6*sqrt(6)*pi
     """
     if not isinstance(expression, Expression):
         expression = SR(expression)
diff --git a/src/sage/symbolic/integration/integral.py b/src/sage/symbolic/integration/integral.py
index 6d298d0b932..9fb669261a3 100644
--- a/src/sage/symbolic/integration/integral.py
+++ b/src/sage/symbolic/integration/integral.py
@@ -528,8 +528,7 @@ def integrate(expression, v=None, a=None, b=None, algorithm=None, hold=False):
 
         sage: f(x) = sqrt(x+sqrt(1+x^2))/x
         sage: integrate(f(x), x, algorithm="fricas")      # optional - fricas
-        2*sqrt(x + sqrt(x^2 + 1)) + log(sqrt(x + sqrt(x^2 + 1)) - 1)
-        - log(sqrt(x + sqrt(x^2 + 1)) + 1) - 2*arctan(sqrt(x + sqrt(x^2 + 1)))
+        2*sqrt(x + sqrt(x^2 + 1)) - 2*arctan(sqrt(x + sqrt(x^2 + 1))) - log(sqrt(x + sqrt(x^2 + 1)) + 1) + log(sqrt(x + sqrt(x^2 + 1)) - 1)
 
     The following definite integral is not found with the
     default integrator::
@@ -541,7 +540,7 @@ def integrate(expression, v=None, a=None, b=None, algorithm=None, hold=False):
     Both fricas and sympy give the correct result::
 
         sage: integrate(f(x), x, 1, 2, algorithm="fricas")  # optional - fricas
-        -1/2*pi + arctan(1/2) + arctan(2) + arctan(5) + arctan(8)
+        -1/2*pi + arctan(8) + arctan(5) + arctan(2) + arctan(1/2)
         sage: integrate(f(x), x, 1, 2, algorithm="sympy")
         -1/2*pi + arctan(8) + arctan(5) + arctan(2) + arctan(1/2)