mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity
org-mode/testing/lisp/test-ob-R.el

324 lines
11 KiB
EmacsLisp
Raw Permalink Normal View History

testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
;;; test-ob-R.el --- tests for ob-R.el -*- lexical-binding: t; -*-
adding a file for R tests * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session test.
2011-09-21 12:57:07 +00:00
Update copyright year
2019-01-01 10:50:56 +00:00
;; Copyright (c) 2011-2014, 2019 Eric Schulte
adding a file for R tests * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session test.
2011-09-21 12:57:07 +00:00
;; Authors: Eric Schulte
Fix copyright notices for test files.
2012-12-13 16:24:19 +00:00
;; This file is not part of GNU Emacs.
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
Prefer HTTPS to HTTP for links to gnu.org
2021-03-20 07:27:57 +00:00
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
adding a file for R tests * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session test.
2011-09-21 12:57:07 +00:00
Fix the master branch. I started from the 78ec8e commit then cherry-picked and squashed commits that have been done in master since then, except the bad commits that overwrote the tree (in master) with the tree in maint. This commit also bumps the version number to 7.8.06. The only "fix" that was made between 78ec8e and the previous commit is e0072f which has been reported to break stuff.
2012-03-19 20:38:12 +00:00
;;; Code:
only load those test files for which the required executables are present * testing/org-test.el (org-exe-not-found): An error type used to signal a missing executable (org-test-for-executable): A function used by test files to throw an error if a required executable is not present. (org-test-load): Simply skip files for which the required executables are not present. * testing/lisp/test-ob-R.el: Conditional loading. * testing/lisp/test-ob-awk.el: Conditional loading. * testing/lisp/test-ob-fortran.el: Conditional loading.
2011-09-21 22:34:43 +00:00
(org-test-for-executable "R")
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
(require 'ob-core)
only load those test files for which the required executables are present * testing/org-test.el (org-exe-not-found): An error type used to signal a missing executable (org-test-for-executable): A function used by test files to throw an error if a required executable is not present. (org-test-load): Simply skip files for which the required executables are not present. * testing/lisp/test-ob-R.el: Conditional loading. * testing/lisp/test-ob-awk.el: Conditional loading. * testing/lisp/test-ob-fortran.el: Conditional loading.
2011-09-21 22:34:43 +00:00
(unless (featurep 'ess)
Indicate tests with missing dependencies by adding a expected failing test * testing/lisp/test-ob-R.el (featurep): Signal missing dependencies with an error rather than a throw. * testing/org-test.el (missing-test-dependency): Define the error signal for missing dependencies. (org-test-for-executable): Signal missing dependencies with an error rather than a throw. (org-test-load): Define an expected failing test for each file with missing dependencies.
2011-11-13 19:30:25 +00:00
(signal 'missing-test-dependency "ESS"))
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
(defvar ess-ask-for-ess-directory)
(defvar ess-history-file)
* testing/lisp/test-ob-R.el: Fix test failures with the newest ESS (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-output-drawer): Force no truncation of output lines in ESS. Otherwise, the expected output may be split into multiple lines. Note that we do not want to override the output splitting outside tests - this is what users may prefer for :results output. And :results value is not affected. Link: https://orgmode.org/list/87ilduqrem.fsf@localhost
2023-04-18 13:04:47 +00:00
(defvar ess-r-post-run-hook)
(declare-function
ess-command "ext:ess-inf"
(cmd &optional out-buffer sleep no-prompt-check wait proc proc force-redisplay timeout))
(declare-function ess-calculate-width "ext:ess-inf" (opt))
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
Fix the master branch. I started from the 78ec8e commit then cherry-picked and squashed commits that have been done in master since then, except the bad commits that overwrote the tree (in master) with the tree in maint. This commit also bumps the version number to 7.8.06. The only "fix" that was made between 78ec8e and the previous commit is e0072f which has been reported to break stuff.
2012-03-19 20:38:12 +00:00
(unless (featurep 'ob-R)
(signal 'missing-test-dependency "Support for R code blocks"))
adding a file for R tests * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session test.
2011-09-21 12:57:07 +00:00
(ert-deftest test-ob-R/simple-session ()
testing/lisp/test-ob-R.el: Initialize ESS vars for :session tests * test-ob-R.el: (test-ob-R/simple-session, test-ob-R/results-file) tests start sessions. As a consequence `ess-ask-for-ess-directory' and `ess-history-file' are let bound to `nil' to avoid prompting for the startup directory and using a history file. Bug Reported by: Achim Gratz Subject: [Bug] Testing: ESS (*R*, R (newest)) starting data directory? Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/104424>
2016-01-24 18:04:43 +00:00
(let (ess-ask-for-ess-directory ess-history-file)
do not set variables belonging to ESS * lisp/ob-R.el (org-babel-R-initiate-session): Protect against use of unbound variable `ess-ask-for-ess-directory´. The default for this variable is true, so act accordingly if it is found unbound. * lisp/ob-R.el: Remove initialization with `nil´ from `ess-ask-for-ess-directory´ and `ess-local-process-name´. Remove second declaration for `ess-local-process-name´. * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Bind `ess-ask-for-ess-directory´ to nil to facilitate batch testing.
2012-09-23 09:07:18 +00:00
(org-test-with-temp-text
"#+begin_src R :session R\n paste(\"Yep!\")\n#+end_src\n"
(should (string= "Yep!" (org-babel-execute-src-block))))))
adding a file for R tests * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session test.
2011-09-21 12:57:07 +00:00
tests for the colnames header argument
2011-11-28 08:55:28 +00:00
(ert-deftest test-ob-R/colnames-yes-header-argument ()
(org-test-with-temp-text "#+name: eg
| col |
|-----|
| a |
| b |
#+header: :colnames yes
#+header: :var x = eg
#+begin_src R
x
#+end_src"
(org-babel-next-src-block)
(should (equal '(("col") hline ("a") ("b"))
(org-babel-execute-src-block)))))
(ert-deftest test-ob-R/colnames-nil-header-argument ()
(org-test-with-temp-text "#+name: eg
| col |
|-----|
| a |
| b |
#+header: :colnames nil
#+header: :var x = eg
#+begin_src R
x
#+end_src"
(org-babel-next-src-block)
(should (equal '(("col") hline ("a") ("b"))
(org-babel-execute-src-block)))))
(ert-deftest test-ob-R/colnames-no-header-argument ()
(org-test-with-temp-text "#+name: eg
| col |
|-----|
| a |
| b |
#+header: :colnames no
#+header: :var x = eg
#+begin_src R
x
#+end_src"
(org-babel-next-src-block)
(should (equal '(("col") ("a") ("b"))
(org-babel-execute-src-block)))))
ob-R.el: Trim extraneous newline from results * lisp/ob-R.el: org-babel-R-evaluate-external-process and org-babel-R-evaluate-session trim the extraneous newlines from the end of R output. * testing/lisp/test-ob-R.el: test-ob-R/results-file tests that `:results file' yields one line enclosed in square brackets for a result like "abc/def.ghi". Fixes issue noted by Andreas Leha Subject: [babel] return file from R Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/103658>
2016-01-20 03:32:11 +00:00
(ert-deftest test-ob-R/results-file ()
testing/lisp/test-ob-R.el: Initialize ESS vars for :session tests * test-ob-R.el: (test-ob-R/simple-session, test-ob-R/results-file) tests start sessions. As a consequence `ess-ask-for-ess-directory' and `ess-history-file' are let bound to `nil' to avoid prompting for the startup directory and using a history file. Bug Reported by: Achim Gratz Subject: [Bug] Testing: ESS (*R*, R (newest)) starting data directory? Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/104424>
2016-01-24 18:04:43 +00:00
(let (ess-ask-for-ess-directory ess-history-file)
(org-test-with-temp-text
"#+NAME: TESTSRC
ob-R.el: Trim extraneous newline from results * lisp/ob-R.el: org-babel-R-evaluate-external-process and org-babel-R-evaluate-session trim the extraneous newlines from the end of R output. * testing/lisp/test-ob-R.el: test-ob-R/results-file tests that `:results file' yields one line enclosed in square brackets for a result like "abc/def.ghi". Fixes issue noted by Andreas Leha Subject: [babel] return file from R Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/103658>
2016-01-20 03:32:11 +00:00
#+BEGIN_SRC R :results file
a <- file.path(\"junk\", \"test.org\")
a
#+END_SRC"
testing/lisp/test-ob-R.el: Initialize ESS vars for :session tests * test-ob-R.el: (test-ob-R/simple-session, test-ob-R/results-file) tests start sessions. As a consequence `ess-ask-for-ess-directory' and `ess-history-file' are let bound to `nil' to avoid prompting for the startup directory and using a history file. Bug Reported by: Achim Gratz Subject: [Bug] Testing: ESS (*R*, R (newest)) starting data directory? Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/104424>
2016-01-24 18:04:43 +00:00
(goto-char (point-min)) (org-babel-execute-maybe)
(org-babel-goto-named-result "TESTSRC") (forward-line 1)
(should (string= "[[file:junk/test.org]]"
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))
(goto-char (point-min)) (forward-line 1)
(insert "#+header: :session\n")
(goto-char (point-min)) (org-babel-execute-maybe)
(org-babel-goto-named-result "TESTSRC") (forward-line 1)
(should (string= "[[file:junk/test.org]]"
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))))
test-ob-R.el: add tests for output with substrings matching prompt * testing/lisp/test-ob-R.el (test-ob-r/output-with-<>): new test for output angle brackets (test-ob-R/output-nonprinted): New test for output results that aren't explicitly printed. (Here all the lines are expected to be printed not just the last one) Patch suggested by Jack Kamm: https://orgmode.org/list/87h7slgbi5.fsf@gmail.com/
2021-05-02 22:18:33 +00:00
(ert-deftest test-ob-r/output-with-<> ()
"make sure angle brackets are well formatted"
(let (ess-ask-for-ess-directory ess-history-file)
(should (string="[1] \"<X> <Y> <!>\"
[1] \"one <two> three\"
[1] \"end35\"
"
(org-test-with-temp-text "#+begin_src R :results output
print(\"<X> <Y> <!>\")
print(\"one <two> three\")
print(\"end35\")
#+end_src
"
(org-babel-execute-src-block))
))))
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
test-ob-R.el: add tests for output with substrings matching prompt * testing/lisp/test-ob-R.el (test-ob-r/output-with-<>): new test for output angle brackets (test-ob-R/output-nonprinted): New test for output results that aren't explicitly printed. (Here all the lines are expected to be printed not just the last one) Patch suggested by Jack Kamm: https://orgmode.org/list/87h7slgbi5.fsf@gmail.com/
2021-05-02 22:18:33 +00:00
;; (ert-deftest test-ob-r/output-with-error ()
;; "make sure angle brackets are well formatted"
;; (let (ess-ask-for-ess-directory ess-history-file)
;; (should (string="Error in print(1/a) : object 'a' not found"
;; (org-test-with-temp-text "#+begin_src R :results output
;; print(1/a)
;; #+end_src
;; "
;; (org-babel-execute-src-block))
;; ))))
(ert-deftest test-ob-R/output-nonprinted ()
(let (ess-ask-for-ess-directory ess-history-file)
(org-test-with-temp-text
"#+begin_src R :results output
4.0 * 3.5
log(10)
log10(10)
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
\(3 + 1) * 5
test-ob-R.el: add tests for output with substrings matching prompt * testing/lisp/test-ob-R.el (test-ob-r/output-with-<>): new test for output angle brackets (test-ob-R/output-nonprinted): New test for output results that aren't explicitly printed. (Here all the lines are expected to be printed not just the last one) Patch suggested by Jack Kamm: https://orgmode.org/list/87h7slgbi5.fsf@gmail.com/
2021-05-02 22:18:33 +00:00
3^-1
1/0
#+end_src"
(should (string= "[1] 14\n[1] 2.302585\n[1] 1\n[1] 20\n[1] 0.3333333\n[1] Inf\n" (org-babel-execute-src-block))))))
test-ob-R.el: add tests for how NA values are printed * testing/lisp/test-ob-R.el (ert-deftest test-ob-r/NA-blank): new test for :results value. Make sure that NA values in R data.frames are empty string instead of nil previously see https://orgmode.org/list/87pn1dufm2.fsf@gmail.com/
2021-05-02 22:23:36 +00:00
(ert-deftest test-ob-r/NA-blank ()
"For :results value, NAs should be empty"
(let (ess-ask-for-ess-directory ess-history-file)
(should (equal '(("A" "B") hline ("" 1) (1 2) (1 "") (1 4) (1 4))
(org-test-with-temp-text "#+BEGIN_SRC R :results value :colnames yes
data.frame(A=c(NA,1,1,1,1),B=c(1,2,NA,4,4))
#+end_src"
(org-babel-execute-src-block))))))
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(ert-deftest ob-session-async-R-simple-session-async-value ()
(let (ess-ask-for-ess-directory
ess-history-file
(org-babel-temporary-directory "/tmp")
(org-confirm-babel-evaluate nil))
(org-test-with-temp-text
"#+begin_src R :session R :async yes\n Sys.sleep(.1)\n paste(\"Yep!\")\n#+end_src\n"
(should (let ((expected "Yep!"))
(and (not (string= expected (org-babel-execute-src-block)))
(string= expected
(progn
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(goto-char (org-babel-where-is-src-block-result))
(org-babel-read-result)))))))))
(ert-deftest ob-session-async-R-simple-session-async-output ()
(let (ess-ask-for-ess-directory
ess-history-file
(org-babel-temporary-directory "/tmp")
* testing/lisp/test-ob-R.el: Fix test failures with the newest ESS (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-output-drawer): Force no truncation of output lines in ESS. Otherwise, the expected output may be split into multiple lines. Note that we do not want to override the output splitting outside tests - this is what users may prefer for :results output. And :results value is not affected. Link: https://orgmode.org/list/87ilduqrem.fsf@localhost
2023-04-18 13:04:47 +00:00
(org-confirm-babel-evaluate nil)
;; Workaround for Emacs 27. See https://orgmode.org/list/87ilduqrem.fsf@localhost
(ess-r-post-run-hook (lambda () (ess-command (ess-calculate-width 9999)))))
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(org-test-with-temp-text
"#+begin_src R :session R :results output :async yes\n Sys.sleep(.1)\n 1:5\n#+end_src\n"
(should (let ((expected "[1] 1 2 3 4 5"))
(and (not (string= expected (org-babel-execute-src-block)))
(string= expected
(progn
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(goto-char (org-babel-where-is-src-block-result))
(org-babel-read-result)))))))))
(ert-deftest ob-session-async-R-named-output ()
(let (ess-ask-for-ess-directory
ess-history-file
(org-babel-temporary-directory "/tmp")
org-confirm-babel-evaluate
(src-block "#+begin_src R :async :session R :results output\n 1:5\n#+end_src")
(results-before "\n\n#+NAME: foobar\n#+RESULTS:\n: [1] 1")
* testing/lisp/test-ob-R.el: Fix test failures with the newest ESS (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-output-drawer): Force no truncation of output lines in ESS. Otherwise, the expected output may be split into multiple lines. Note that we do not want to override the output splitting outside tests - this is what users may prefer for :results output. And :results value is not affected. Link: https://orgmode.org/list/87ilduqrem.fsf@localhost
2023-04-18 13:04:47 +00:00
(results-after "\n\n#+NAME: foobar\n#+RESULTS:\n: [1] 1 2 3 4 5\n")
;; Workaround for Emacs 27. See https://orgmode.org/list/87ilduqrem.fsf@localhost
(ess-r-post-run-hook (lambda () (ess-command (ess-calculate-width 9999)))))
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(org-test-with-temp-text
(concat src-block results-before)
(should (progn (org-babel-execute-src-block)
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(string= (concat src-block results-after)
(buffer-string)))))))
(ert-deftest ob-session-async-R-named-value ()
(let (ess-ask-for-ess-directory
ess-history-file
org-confirm-babel-evaluate
(org-babel-temporary-directory "/tmp")
(src-block "#+begin_src R :async :session R :results value\n paste(\"Yep!\")\n#+end_src")
(results-before "\n\n#+NAME: foobar\n#+RESULTS:\n: [1] 1")
(results-after "\n\n#+NAME: foobar\n#+RESULTS:\n: Yep!\n"))
(org-test-with-temp-text
(concat src-block results-before)
(should (progn (org-babel-execute-src-block)
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(string= (concat src-block results-after)
(buffer-string)))))))
(ert-deftest ob-session-async-R-output-drawer ()
(let (ess-ask-for-ess-directory
ess-history-file
org-confirm-babel-evaluate
(org-babel-temporary-directory "/tmp")
(src-block "#+begin_src R :async :session R :results output drawer\n 1:5\n#+end_src")
* testing/lisp/test-ob-R.el: Fix test failures with the newest ESS (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-output-drawer): Force no truncation of output lines in ESS. Otherwise, the expected output may be split into multiple lines. Note that we do not want to override the output splitting outside tests - this is what users may prefer for :results output. And :results value is not affected. Link: https://orgmode.org/list/87ilduqrem.fsf@localhost
2023-04-18 13:04:47 +00:00
(result "\n\n#+RESULTS:\n:results:\n[1] 1 2 3 4 5\n:end:\n")
;; Workaround for Emacs 27. See https://orgmode.org/list/87ilduqrem.fsf@localhost
(ess-r-post-run-hook (lambda () (ess-command (ess-calculate-width 9999)))))
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(org-test-with-temp-text
src-block
(should (progn (org-babel-execute-src-block)
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(string= (concat src-block result)
(buffer-string)))))))
(ert-deftest ob-session-async-R-value-drawer ()
(let (ess-ask-for-ess-directory
ess-history-file
org-confirm-babel-evaluate
(org-babel-temporary-directory "/tmp")
(src-block "#+begin_src R :async :session R :results value drawer\n 1:3\n#+end_src")
(result "\n\n#+RESULTS:\n:results:\n1\n2\n3\n:end:\n"))
(org-test-with-temp-text
src-block
(should (progn (org-babel-execute-src-block)
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
(string= (concat src-block result)
(buffer-string)))))))
test-ob-R.el: New function to test for :result output * test-ob-R.el (ob-session-R-result-output): This test will check if output is printed to buffer in a session with :results output. This test is to prevent the bug mentioned in https://list.orgmode.org/877czca7oj.fsf@u-bordeaux.fr/ does not happen again.
2022-12-06 07:31:32 +00:00
; add test for :result output
(ert-deftest ob-session-R-result-output ()
(let (ess-ask-for-ess-directory
ess-history-file
org-confirm-babel-evaluate
(org-babel-temporary-directory "/tmp")
(src-block "#+begin_src R :session R :results output \n 1:3\n#+end_src")
(result "\n\n#+RESULTS:\n: [1] 1 2 3\n" ))
(org-test-with-temp-text
src-block
(should (progn (org-babel-execute-src-block)
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
test-ob-R.el: New function to test for :result output * test-ob-R.el (ob-session-R-result-output): This test will check if output is printed to buffer in a session with :results output. This test is to prevent the bug mentioned in https://list.orgmode.org/877czca7oj.fsf@u-bordeaux.fr/ does not happen again.
2022-12-06 07:31:32 +00:00
(string= (concat src-block result)
(buffer-string)))))))
lisp/ob-R: Async evaluation in R * lisp/ob-R.el (ob-session-async-R-indicator): Add constant representing a prefix R to identity session. (ob-session-async-org-babel-R-evaluate-session): New function to evaluate R src block asynchrously. (ob-session-async-R-value-callback): New function that calls back the result of the asynchronous evaluation. (org-babel-R-evaluate): Add `async' parameter and call `ob-session-async-org-babel-R-evaluate-session' if `async' parameter is present. (org-babel-execute:R): Call `org-babel-comint-use-async' to check if async is among `params' and add async parameter to `org-babel-R-evaluate'. * testing/lisp/test-ob-R.el: Add 7 more tests for async evaluations, also taken from the `ob-session-async' package. This is almost a carbon copy of Jack Kamm's `ob-session-async'. The original source code can be found https://github.com/jackkamm/ob-session-async. Please refer to the following thread to trace back the discussion on async evaluation in R: https://list.orgmode.org/87eed9g9p6.fsf@gmail.com/
2021-09-26 16:25:23 +00:00
* testing/lisp/test-ob-R.el (ob-session-R-result-value): New test
2023-04-18 13:04:57 +00:00
(ert-deftest ob-session-R-result-value ()
(let (ess-ask-for-ess-directory
ess-history-file
org-confirm-babel-evaluate
(org-babel-temporary-directory "/tmp"))
(org-test-with-temp-text
"#+begin_src R :session R :results value \n 1:50\n#+end_src"
(should
(equal (number-sequence 1 50)
(mapcar #'car (org-babel-execute-src-block)))))))
ob-R.el: Restore the handling of org-list in as var * ob-R.el (org-babel-R-assign-elisp): Use the patch from ccberry@health.ucsd.edu, to print org-list as a one column table as it was the case in release_9.5. The break in R is due commit b4e437f96 * ob-core: Resolve named list references to simple lists. * test-ob-R.el (ob-R-nested-list): New function to test that org list with multiple level are handled as expected in R. see https://list.orgmode.org/87bkofh0ir.fsf@localhost/ for context.
2022-12-07 20:25:19 +00:00
;; test for printing of (nested) list
(ert-deftest ob-R-nested-list ()
"List are printed as the first column of a table and nested lists are ignored"
(let (ess-ask-for-ess-directory
ess-history-file
org-confirm-babel-evaluate
(org-babel-temporary-directory "/tmp")
(text "
#+NAME: example-list
- simple
- not
- nested
- list
#+BEGIN_SRC R :var x=example-list
x
#+END_SRC
")
(result "
#+RESULTS:
| simple |
| list |
"))
(org-test-with-temp-text-in-file
text
(goto-char (point-min))
(org-babel-next-src-block)
(should (progn
(org-babel-execute-src-block)
Fix obsolete `sleep-for' usage * lisp/ob-lua.el (org-babel-lua-evaluate-session): * lisp/ob-python.el (org-babel-python-initiate-session-by-key): (org-babel-python-evaluate-session): * testing/lisp/test-ob-R.el (ob-session-async-R-simple-session-async-value): (ob-session-async-R-simple-session-async-output): (ob-session-async-R-named-output): (ob-session-async-R-named-value): (ob-session-async-R-output-drawer): (ob-session-async-R-value-drawer): (ob-session-R-result-output): * testing/lisp/test-ob-julia.el (test-ob-julia/async-simple-session-output): (test-ob-julia/async-named-output): (test-ob-julia/async-output-drawer): * testing/lisp/test-ob-python.el (test-ob-python/async-simple-session-output): (test-ob-python/async-named-output): (test-ob-python/async-output-drawer): Replace deprecated two integer argument `sleep-for' calls with one float `sleep-for' calls.
2023-10-21 09:50:22 +00:00
(sleep-for 0.200)
ob-R.el: Restore the handling of org-list in as var * ob-R.el (org-babel-R-assign-elisp): Use the patch from ccberry@health.ucsd.edu, to print org-list as a one column table as it was the case in release_9.5. The break in R is due commit b4e437f96 * ob-core: Resolve named list references to simple lists. * test-ob-R.el (ob-R-nested-list): New function to test that org list with multiple level are handled as expected in R. see https://list.orgmode.org/87bkofh0ir.fsf@localhost/ for context.
2022-12-07 20:25:19 +00:00
(string= (concat text result)
(buffer-string)))))))
fix leftover cruft in test-ob-R.el
2011-09-21 19:31:38 +00:00
(provide 'test-ob-R)
adding a file for R tests * testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session test.
2011-09-21 12:57:07 +00:00
fix leftover cruft in test-ob-R.el
2011-09-21 19:31:38 +00:00
;;; test-ob-R.el ends here
test-ob-R.el: add tests for output with substrings matching prompt * testing/lisp/test-ob-R.el (test-ob-r/output-with-<>): new test for output angle brackets (test-ob-R/output-nonprinted): New test for output results that aren't explicitly printed. (Here all the lines are expected to be printed not just the last one) Patch suggested by Jack Kamm: https://orgmode.org/list/87h7slgbi5.fsf@gmail.com/
2021-05-02 22:18:33 +00:00