1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Description: CDK 2.10 renamed AtomContainer2 to AtomContainer
Author: zachcp
Origin: upstream pull 156
Bug-Debian: https://bugs.debian.org/1114465
Forwarded: not-needed
--- r-cran-rcdk-3.8.1+dfsg.orig/inst/unitTests/runit.frags.R
+++ r-cran-rcdk-3.8.1+dfsg/inst/unitTests/runit.frags.R
@@ -32,5 +32,5 @@ test.frag3 <- function() {
checkEquals(length(f), 3)
fworks <- unlist(lapply(f, function(x) unlist(lapply(x$frameworks, .jclass))))
- checkTrue(all(fworks == "org.openscience.cdk.silent.AtomContainer2"))
+ checkTrue(all(fworks %in% c("org.openscience.cdk.silent.AtomContainer", "org.openscience.cdk.silent.AtomContainer2")))
}
--- r-cran-rcdk-3.8.1+dfsg.orig/inst/unitTests/runit.match.R
+++ r-cran-rcdk-3.8.1+dfsg/inst/unitTests/runit.match.R
@@ -46,7 +46,7 @@ test.mcs1 <- function() {
lapply(mols, do.aromaticity)
lapply(mols, set.atom.types)
mcs <- get.mcs(mols[[1]], mols[[2]], TRUE)
- checkEquals("org.openscience.cdk.silent.AtomContainer2", .jclass(mcs))
+ checkTrue(.jclass(mcs) %in% c("org.openscience.cdk.silent.AtomContainer", "org.openscience.cdk.silent.AtomContainer2"))
checkEquals(9, get.atom.count(mcs))
}
@@ -55,7 +55,7 @@ test.mcs3 <- function() {
lapply(mols, do.aromaticity)
lapply(mols, set.atom.types)
mcs <- get.mcs(mols[[1]], mols[[2]], TRUE)
- checkEquals("org.openscience.cdk.silent.AtomContainer2", .jclass(mcs))
+ checkTrue(.jclass(mcs) %in% c("org.openscience.cdk.silent.AtomContainer", "org.openscience.cdk.silent.AtomContainer2"))
checkEquals(21, get.atom.count(mcs))
}
|
