From 0056584e5168df75bca159ddf3469aa07457b77d Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 19 Nov 2021 00:18:22 +0100 Subject: Update tests and logs --- tests/testthat/test_chent.R | 2 +- tests/testthat/test_pai.R | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/testthat') diff --git a/tests/testthat/test_chent.R b/tests/testthat/test_chent.R index 094ff8b..4551cf7 100644 --- a/tests/testthat/test_chent.R +++ b/tests/testthat/test_chent.R @@ -2,7 +2,7 @@ context("Generation of chent objects") # Check if we can use RDKit skip_if_no_rdkit <- function() { - if (!chents:::rdkit_available()) skip("RDKit is not available via PythonInR") + if (!chents:::rdkit_available) skip("RDKit is not available via reticulate") } oct <- chent$new("1-octanol", smiles = "CCCCCCCCO", pubchem = FALSE, chyaml = FALSE) diff --git a/tests/testthat/test_pai.R b/tests/testthat/test_pai.R index 368876e..e22b6ae 100644 --- a/tests/testthat/test_pai.R +++ b/tests/testthat/test_pai.R @@ -8,12 +8,12 @@ test_that("a pai object is correctly generated from an ambiguous name", { glyphosate <- pai$new("glyphosate", chyaml = FALSE) expect_message(pai$new("benzalkonium chloride", chyaml = FALSE), "did not give results") - expect_equivalent(glyphosate$alanwood$cas, "1071-83-6") - expect_equivalent(glyphosate$alanwood$formula, "C3H8NO5P") - expect_equivalent(glyphosate$alanwood$iupac_name, "N-(phosphonomethyl)glycine") + expect_equivalent(glyphosate$bcpc$cas, "1071-83-6") + expect_equivalent(glyphosate$bcpc$formula, "C3H8NO5P") + expect_equivalent(glyphosate$bcpc$iupac_name, "N-(phosphonomethyl)glycine") expect_equal(names(glyphosate$identifier), "glyphosate") ik = "XDDAORKBJWWYJS-UHFFFAOYSA-N" - attr(ik, "source") <- c("alanwood", "pubchem") + attr(ik, "source") <- c("bcpc", "pubchem") expect_equal(glyphosate$inchikey, ik) expect_equivalent(round(glyphosate$mw, 2), 169.07) smiles <- "C(C(=O)O)NCP(=O)(O)O" -- cgit v1.2.1