Menu
▾
▴
[Cdk-commits] SF.net SVN: cdk: [10510] cdk/trunk
|
From: <eg...@us...> - 2008-03-23 07:59:34
|
Revision: 10510
http://cdk.svn.sourceforge.net/cdk/?rev=10510&view=rev
Author: egonw
Date: 2008-03-23 00:59:22 -0700 (Sun, 23 Mar 2008)
Log Message:
-----------
Introduced a dict module, to lower the number of deps on the extra module
Modified Paths:
--------------
cdk/trunk/build.xml
cdk/trunk/src/META-INF/applications.cdkdepends
cdk/trunk/src/META-INF/experimental.cdkdepends
cdk/trunk/src/META-INF/extra.cdkdepends
cdk/trunk/src/META-INF/libiocml.cdkdepends
cdk/trunk/src/META-INF/qsarmolecular.cdkdepends
cdk/trunk/src/META-INF/reaction.cdkdepends
cdk/trunk/src/META-INF/test-reaction.cdkdepends
cdk/trunk/src/main/org/openscience/cdk/dict/CDKDictionaryReferences.java
cdk/trunk/src/main/org/openscience/cdk/dict/Dictionary.java
cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryDatabase.java
cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryHandler.java
cdk/trunk/src/main/org/openscience/cdk/dict/Entry.java
cdk/trunk/src/main/org/openscience/cdk/dict/EntryReact.java
cdk/trunk/src/main/org/openscience/cdk/dict/OWLFile.java
cdk/trunk/src/main/org/openscience/cdk/dict/OWLReact.java
cdk/trunk/src/main/org/openscience/cdk/libio/cml/Convertor.java
cdk/trunk/src/test/org/openscience/cdk/dict/DictDBTest.java
cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java
Added Paths:
-----------
cdk/trunk/src/META-INF/dict.cdkdepends
cdk/trunk/src/META-INF/dict.libdepends
cdk/trunk/src/META-INF/test-dict.cdkdepends
cdk/trunk/src/META-INF/test-dict.devellibdepends
cdk/trunk/src/test/org/openscience/cdk/modulesuites/MdictTests.java
Modified: cdk/trunk/build.xml
===================================================================
--- cdk/trunk/build.xml 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/build.xml 2008-03-23 07:59:22 UTC (rev 10510)
@@ -448,6 +448,7 @@
<parallel>
<antcall target="compile-module"><param name="module" value="data"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="atomtype"/><param name="source" value="${src}/main"/></antcall>
+ <antcall target="compile-module"><param name="module" value="dict"/><param name="source" value="${src}/main"/></antcall>
</parallel>
<parallel>
<antcall target="compile-module"><param name="module" value="datadebug"/><param name="source" value="${src}/main"/></antcall>
@@ -468,21 +469,19 @@
<antcall target="compile-module"><param name="module" value="extra"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="sdg"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="inchi"/><param name="source" value="${src}/main"/></antcall>
+ <antcall target="compile-module"><param name="module" value="libiocml"/><param name="source" value="${src}/main"/></antcall>
</parallel>
<parallel>
<antcall target="compile-module"><param name="module" value="control"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="smiles"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="smarts"/><param name="source" value="${src}/main"/></antcall>
- <antcall target="compile-module"><param name="module" value="libiocml"/><param name="source" value="${src}/main"/></antcall>
+ <antcall target="compile-module"><param name="module" value="reaction"/><param name="source" value="${src}/main"/></antcall>
+ <antcall target="compile-module"><param name="module" value="pdb-cml"/><param name="source" value="${src}/main"/></antcall>
+ <antcall target="compile-module"><param name="module" value="libiomd"/><param name="source" value="${src}/main"/></antcall>
</parallel>
<parallel>
<antcall target="compile-module"><param name="module" value="pcore"/><param name="source" value="${src}/main"/></antcall>
- <antcall target="compile-module"><param name="module" value="libiomd"/><param name="source" value="${src}/main"/></antcall>
- <antcall target="compile-module"><param name="module" value="pdb-cml"/><param name="source" value="${src}/main"/></antcall>
- <antcall target="compile-module"><param name="module" value="reaction"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="progzjcp"/><param name="source" value="${src}/main"/></antcall>
- </parallel>
- <parallel>
<antcall target="compile-module"><param name="module" value="charges"/><param name="source" value="${src}/main"/></antcall>
</parallel>
<parallel>
@@ -513,6 +512,7 @@
<antcall target="compile-module"><param name="module" value="core"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="atomtype"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="standard"/><param name="source" value="${src}/main"/></antcall>
+ <antcall target="compile-module"><param name="module" value="dict"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="data"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="render"/><param name="source" value="${src}/main"/></antcall>
<antcall target="compile-module"><param name="module" value="io"/><param name="source" value="${src}/main"/></antcall>
@@ -557,6 +557,7 @@
<parallel threadCount="${threadCount}">
<antcall target="compile-module"><param name="module" value="test-core"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-data"/><param name="source" value="${src}/test"/></antcall>
+ <antcall target="compile-module"><param name="module" value="test-dict"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-qsar"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-libiocml"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-valencycheck"/><param name="source" value="${src}/test"/></antcall>
@@ -597,6 +598,7 @@
<antcall target="compile-module"><param name="module" value="test-atomtype"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-standard"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-data"/><param name="source" value="${src}/test"/></antcall>
+ <antcall target="compile-module"><param name="module" value="test-dict"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-datadebug"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-nonotify"/><param name="source" value="${src}/test"/></antcall>
<antcall target="compile-module"><param name="module" value="test-io"/><param name="source" value="${src}/test"/></antcall>
Modified: cdk/trunk/src/META-INF/applications.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/applications.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/applications.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -15,3 +15,4 @@
cdk-svg.jar
cdk-smiles.jar
cdk-atomtype.jar
+cdk-dict.jar
Added: cdk/trunk/src/META-INF/dict.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/dict.cdkdepends (rev 0)
+++ cdk/trunk/src/META-INF/dict.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -0,0 +1,2 @@
+cdk-interfaces.jar
+cdk-core.jar
Added: cdk/trunk/src/META-INF/dict.libdepends
===================================================================
--- cdk/trunk/src/META-INF/dict.libdepends (rev 0)
+++ cdk/trunk/src/META-INF/dict.libdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -0,0 +1 @@
+xom-1.1.jar
Modified: cdk/trunk/src/META-INF/experimental.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/experimental.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/experimental.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -13,3 +13,4 @@
cdk-smarts.jar
cdk-qsar.jar
cdk-isomorphism.jar
+cdk-dict.jar
Modified: cdk/trunk/src/META-INF/extra.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/extra.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/extra.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -9,3 +9,4 @@
cdk-atomtype.jar
cdk-formula.jar
cdk-isomorphism.jar
+cdk-dict.jar
Modified: cdk/trunk/src/META-INF/libiocml.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/libiocml.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/libiocml.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -1,7 +1,7 @@
+cdk-interfaces.jar
cdk-core.jar
cdk-data.jar
-cdk-extra.jar
-cdk-interfaces.jar
+cdk-dict.jar
cdk-io.jar
cdk-standard.jar
Modified: cdk/trunk/src/META-INF/qsarmolecular.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/qsarmolecular.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/qsarmolecular.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -13,3 +13,4 @@
cdk-smiles.jar
cdk-formula.jar
cdk-isomorphism.jar
+cdk-dict.jar
Modified: cdk/trunk/src/META-INF/reaction.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/reaction.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/reaction.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -9,3 +9,4 @@
cdk-sdg.jar
cdk-atomtype.jar
cdk-isomorphism.jar
+cdk-dict.jar
Added: cdk/trunk/src/META-INF/test-dict.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/test-dict.cdkdepends (rev 0)
+++ cdk/trunk/src/META-INF/test-dict.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -0,0 +1,2 @@
+cdk-dict.jar
+cdk-test.jar
Added: cdk/trunk/src/META-INF/test-dict.devellibdepends
===================================================================
--- cdk/trunk/src/META-INF/test-dict.devellibdepends (rev 0)
+++ cdk/trunk/src/META-INF/test-dict.devellibdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -0,0 +1,2 @@
+junit-4.3.1.jar
+
Modified: cdk/trunk/src/META-INF/test-reaction.cdkdepends
===================================================================
--- cdk/trunk/src/META-INF/test-reaction.cdkdepends 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/META-INF/test-reaction.cdkdepends 2008-03-23 07:59:22 UTC (rev 10510)
@@ -11,3 +11,4 @@
cdk-smiles.jar
cdk-test.jar
cdk-isomorphism.jar
+cdk-dict.jar
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/CDKDictionaryReferences.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/CDKDictionaryReferences.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/CDKDictionaryReferences.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -27,7 +27,14 @@
*/
package org.openscience.cdk.dict;
-import org.openscience.cdk.*;
+import org.openscience.cdk.interfaces.IAtom;
+import org.openscience.cdk.interfaces.IBond;
+import org.openscience.cdk.interfaces.IChemModel;
+import org.openscience.cdk.interfaces.IChemObject;
+import org.openscience.cdk.interfaces.IElement;
+import org.openscience.cdk.interfaces.IIsotope;
+import org.openscience.cdk.interfaces.IMolecule;
+import org.openscience.cdk.interfaces.IReaction;
/**
* This class transforms implicit references to dictionary of CDK
@@ -43,47 +50,48 @@
* @cdk.svnrev $Revision$
* @cdk.created 2003-08-06
* @cdk.keyword dictionary, implicit CDK references
+ * @cdk.module dict
*/
public class CDKDictionaryReferences {
private static String prefix = DictionaryDatabase.DICTREFPROPERTYNAME;
- public static void makeReferencesExplicit(org.openscience.cdk.interfaces.IChemObject object) {
- if (object instanceof Atom) {
- makeReferencesExplicitForAtom((Atom)object);
- } else if (object instanceof org.openscience.cdk.interfaces.IBond) {
- makeReferencesExplicitForBond((Bond)object);
- } else if (object instanceof ChemModel) {
- makeReferencesExplicitForChemModel((ChemModel)object);
- } else if (object instanceof Isotope) {
- makeReferencesExplicitForIsotope((Isotope)object);
- } else if (object instanceof Element) {
- makeReferencesExplicitForElement((Element)object);
- } else if (object instanceof Molecule) {
- makeReferencesExplicitForMolecule((Molecule)object);
- } else if (object instanceof Reaction) {
- makeReferencesExplicitForReaction((Reaction)object);
+ public static void makeReferencesExplicit(IChemObject object) {
+ if (object instanceof IAtom) {
+ makeReferencesExplicitForAtom((IAtom)object);
+ } else if (object instanceof IBond) {
+ makeReferencesExplicitForBond((IBond)object);
+ } else if (object instanceof IChemModel) {
+ makeReferencesExplicitForChemModel((IChemModel)object);
+ } else if (object instanceof IIsotope) {
+ makeReferencesExplicitForIsotope((IIsotope)object);
+ } else if (object instanceof IElement) {
+ makeReferencesExplicitForElement((IElement)object);
+ } else if (object instanceof IMolecule) {
+ makeReferencesExplicitForMolecule((IMolecule)object);
+ } else if (object instanceof IReaction) {
+ makeReferencesExplicitForReaction((IReaction)object);
}
}
- private static void makeReferencesExplicitForAtom(org.openscience.cdk.interfaces.IAtom atom) {
+ private static void makeReferencesExplicitForAtom(IAtom atom) {
int selfCounter = 0;
atom.setProperty(prefix + ":self:" + selfCounter++, "chemical:atom");
makeReferencesExplicitForElement(atom);
}
- private static void makeReferencesExplicitForBond(org.openscience.cdk.interfaces.IBond bond) {
+ private static void makeReferencesExplicitForBond(IBond bond) {
int selfCounter = 0;
bond.setProperty(prefix + ":self:" + selfCounter++, "chemical:covalentBond");
bond.setProperty(prefix + ":field:order", "chemical:bondOrder");
}
- private static void makeReferencesExplicitForChemModel(org.openscience.cdk.interfaces.IChemModel model) { // NOPMD
+ private static void makeReferencesExplicitForChemModel(IChemModel model) { // NOPMD
// nothing to do
}
- private static void makeReferencesExplicitForElement(org.openscience.cdk.interfaces.IElement element) {
+ private static void makeReferencesExplicitForElement(IElement element) {
int selfCounter = 0;
element.setProperty(prefix + ":field:symbol", "chemical:atomSymbol");
element.setProperty(prefix + ":field:atomicNumber", "chemical:atomicNumber");
@@ -103,19 +111,19 @@
}
}
- private static void makeReferencesExplicitForIsotope(org.openscience.cdk.interfaces.IIsotope isotope) {
+ private static void makeReferencesExplicitForIsotope(IIsotope isotope) {
int selfCounter = 0;
isotope.setProperty(prefix + ":self:" + selfCounter++, "chemical:isotope");
}
- private static void makeReferencesExplicitForMolecule(org.openscience.cdk.interfaces.IMolecule molecule) {
+ private static void makeReferencesExplicitForMolecule(IMolecule molecule) {
int selfCounter = 0;
molecule.setProperty(prefix + ":self:" + selfCounter++, "chemical:molecularEntity");
/* remark: this is not strictly true... the Compendium includes the
ion pair, which normally would not considered a CDK molecule */
}
- private static void makeReferencesExplicitForReaction(org.openscience.cdk.interfaces.IReaction reaction) {
+ private static void makeReferencesExplicitForReaction(IReaction reaction) {
int selfCounter = 0;
reaction.setProperty(prefix + ":self:" + selfCounter++, "reaction:reactionStep");
}
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/Dictionary.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/Dictionary.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/Dictionary.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -49,6 +49,7 @@
* @cdk.svnrev $Revision$
* @cdk.created 2003-08-23
* @cdk.keyword dictionary
+ * @cdk.module dict
*/
public class Dictionary {
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryDatabase.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryDatabase.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryDatabase.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -44,6 +44,7 @@
* @cdk.created 2003-04-06
* @cdk.keyword dictionary
* @cdk.depends xom.jar
+ * @cdk.module dict
*/
public class DictionaryDatabase {
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryHandler.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryHandler.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/DictionaryHandler.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -28,6 +28,8 @@
/**
* Class for unmarshalling a dictionary shema file.
+ *
+ * @cdk.module dict
*/
public class DictionaryHandler extends DefaultHandler {
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/Entry.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/Entry.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/Entry.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -37,6 +37,7 @@
* @cdk.svnrev $Revision$
* @cdk.created 2003-08-23
* @cdk.keyword dictionary
+ * @cdk.module dict
*
* @see Dictionary
*/
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/EntryReact.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/EntryReact.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/EntryReact.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -38,6 +38,7 @@
* @author Miguel Rojas <mig...@us...>
* @cdk.created 2008-01-01
* @cdk.keyword dictionary
+ * @cdk.module dict
*
* @see Dictionary
*/
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/OWLFile.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/OWLFile.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/OWLFile.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -47,6 +47,7 @@
* @cdk.svnrev $Revision$
* @cdk.created 2005-11-18
* @cdk.keyword dictionary
+ * @cdk.module dict
*
* @cdk.depends xom-1.0.jar
*/
Modified: cdk/trunk/src/main/org/openscience/cdk/dict/OWLReact.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/dict/OWLReact.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/dict/OWLReact.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -46,6 +46,7 @@
* @author Miguel Rojas <mig...@us...>
* @cdk.created 2008-01-01
* @cdk.keyword dictionary
+ * @cdk.module dict
*
* @cdk.depends xom-1.0.jar
*/
Modified: cdk/trunk/src/main/org/openscience/cdk/libio/cml/Convertor.java
===================================================================
--- cdk/trunk/src/main/org/openscience/cdk/libio/cml/Convertor.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/main/org/openscience/cdk/libio/cml/Convertor.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -36,7 +36,6 @@
import org.openscience.cdk.CDKConstants;
import org.openscience.cdk.Monomer;
import org.openscience.cdk.Strand;
-import org.openscience.cdk.config.Elements;
import org.openscience.cdk.config.IsotopeFactory;
import org.openscience.cdk.dict.DictRef;
import org.openscience.cdk.dict.DictionaryDatabase;
@@ -535,7 +534,7 @@
Iterator atoms = ((IBond)bonds.next()).atoms();
while (atoms.hasNext()) {
IAtom atom=(IAtom)atoms.next();
- if (Elements.HYDROGEN.getSymbol().equals(atom.getSymbol()) && atom!=cdkAtom) totalHydrogen++;
+ if ("H".equals(atom.getSymbol()) && atom!=cdkAtom) totalHydrogen++;
}
}
} // else: it is the implicit hydrogen count
Modified: cdk/trunk/src/test/org/openscience/cdk/dict/DictDBTest.java
===================================================================
--- cdk/trunk/src/test/org/openscience/cdk/dict/DictDBTest.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/test/org/openscience/cdk/dict/DictDBTest.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -31,7 +31,7 @@
/**
* Checks the functionality of the DictionaryDatabase class.
*
- * @cdk.module test-extra
+ * @cdk.module test-dict
*
* @see org.openscience.cdk.dict.DictionaryDatabase
*/
Added: cdk/trunk/src/test/org/openscience/cdk/modulesuites/MdictTests.java
===================================================================
--- cdk/trunk/src/test/org/openscience/cdk/modulesuites/MdictTests.java (rev 0)
+++ cdk/trunk/src/test/org/openscience/cdk/modulesuites/MdictTests.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -0,0 +1,47 @@
+/* $Revision: 10506 $ $Author: egonw $ $Date: 2008-03-22 16:10:12 +0100 (Sat, 22 Mar 2008) $
+ *
+ * Copyright (C) 1997-2007 The Chemistry Development Kit (CDK) project
+ *
+ * Contact: cdk...@li...
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package org.openscience.cdk.modulesuites;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.openscience.cdk.dict.DictDBTest;
+
+/**
+ * TestSuite that runs all the sample tests.
+ *
+ * @cdk.module test-dict
+ * @cdk.depends log4j.jar
+ * @cdk.depends junit.jar
+ */
+public class MdictTests {
+
+ public static Test suite() {
+ TestSuite suite= new TestSuite("All CDK dict module Tests");
+
+ // from cdk.dict
+ suite.addTest(new JUnit4TestAdapter(DictDBTest.class));
+
+ return suite;
+ }
+
+}
Modified: cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java
===================================================================
--- cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java 2008-03-23 06:33:36 UTC (rev 10509)
+++ cdk/trunk/src/test/org/openscience/cdk/modulesuites/MextraTests.java 2008-03-23 07:59:22 UTC (rev 10510)
@@ -39,7 +39,6 @@
import org.openscience.cdk.applications.undoredo.ConvertToRadicalEditTest;
import org.openscience.cdk.applications.undoredo.FlipEditTest;
import org.openscience.cdk.applications.undoredo.RemoveAtomsAndBondsEditTest;
-import org.openscience.cdk.dict.DictDBTest;
import org.openscience.cdk.fingerprint.ExtendedFingerprinterTest;
import org.openscience.cdk.fingerprint.StandardSubstructureSetsTest;
import org.openscience.cdk.fingerprint.SubstructureFingerprinterTest;
@@ -77,8 +76,6 @@
// from cdk.test.applications
suite.addTest(new JUnit4TestAdapter(APIVersionTesterTest.class));
// from cdk.test.aromaticity
- // from cdk.test.dict
- suite.addTest(new JUnit4TestAdapter(DictDBTest.class));
// from cdk.test.geometry
suite.addTest(RDFCalculatorTest.suite());
// from cdk.test.geometry.align
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|