[Cdk-commits] SF.net SVN: cdk: [11457] cdk/branches/egonw-diff/src/main/org/openscience/ cdk/tools/diff/tree

[<eg...@us...>]

Revision: 11457
          http://cdk.svn.sourceforge.net/cdk/?rev=11457&view=rev
Author:   egonw
Date:     2008-06-29 01:35:58 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Started to add annotation

Modified Paths:
--------------
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifferenceList.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AtomTypeHybridizationDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BondOrderDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanArrayDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/ChemObjectDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/DoubleDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/IntegerDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point2dDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point3dDifference.java
    cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/StringDifference.java

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,12 +20,15 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+
 /**
  * Difference between two IChemObjects.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.AbstractDifferenceTest")
 public abstract class AbstractDifference implements IDifference {
 
     protected AbstractDifference() {}

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifferenceList.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifferenceList.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AbstractDifferenceList.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -24,12 +24,15 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.openscience.cdk.annotations.TestClass;
+
 /**
  * Diff between two IChemObjects.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.AbstractDifferenceListTest")
 public abstract class AbstractDifferenceList implements IDifferenceList {
 
     protected List<IDifference> differences;

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AtomTypeHybridizationDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AtomTypeHybridizationDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/AtomTypeHybridizationDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,6 +20,8 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.interfaces.IAtomType;
 
 /**
@@ -28,6 +30,7 @@
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.AtomTypeHybridizationDifferenceTest")
 public class AtomTypeHybridizationDifference implements IDifference {
 
     private String name;
@@ -40,6 +43,7 @@
         this.second = second;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, IAtomType.Hybridization first, IAtomType.Hybridization second) {
         if (first == second) {
             return null;

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BondOrderDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BondOrderDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BondOrderDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,6 +20,8 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.interfaces.IBond;
 
 /**
@@ -28,6 +30,7 @@
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.BondOrderDifferenceTest")
 public class BondOrderDifference implements IDifference {
 
     private String name;
@@ -40,6 +43,7 @@
         this.second = second;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, IBond.Order first, IBond.Order second) {
         if (first == second) {
             return null;

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanArrayDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanArrayDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanArrayDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -22,12 +22,16 @@
 
 import java.util.Iterator;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * Difference between two boolean[]'s.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.BooleanArrayDifferenceTest")
 public class BooleanArrayDifference extends AbstractDifferenceList implements IDifferenceList {
 
     private String name;
@@ -36,6 +40,7 @@
         this.name = name;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, boolean[] first, boolean[] second) {
         if (first == null && second == null) return null;
         

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/BooleanDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,12 +20,16 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * {@link IDifference} between two {@link Boolean}s.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.BooleanDifferenceTest")
 public class BooleanDifference implements IDifference {
 
     private String name;
@@ -38,6 +42,7 @@
         this.second = second;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, Boolean first, Boolean second) {
         if (first == second) {
             return null;

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/ChemObjectDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/ChemObjectDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/ChemObjectDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -22,6 +22,7 @@
 
 import java.util.Iterator;
 
+import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.interfaces.IChemObject;
 
 /**
@@ -30,6 +31,7 @@
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.ChemObjectDifferenceTest")
 public class ChemObjectDifference extends AbstractDifferenceList implements IDifferenceList {
 
     private String name;

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/DoubleDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/DoubleDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/DoubleDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,12 +20,16 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * {@link IDifference} between two {@link Double}.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.DoubleDifferenceTest")
 public class DoubleDifference implements IDifference {
 
     private final static double ERROR = 0.000000001;
@@ -40,6 +44,7 @@
         this.second = second;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, Double first, Double second) {
         if (first == null && second == null) {
             return null; // no difference

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/IntegerDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/IntegerDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/IntegerDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,12 +20,16 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * {@link IDifference} between two {@link Integer}.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.IntegerDifferenceTest")
 public class IntegerDifference implements IDifference {
 
     private String name;
@@ -38,6 +42,7 @@
         this.second = second;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, Integer first, Integer second) {
         if (first == null && second == null) {
             return null; // no difference

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point2dDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point2dDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point2dDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -24,12 +24,16 @@
 
 import javax.vecmath.Point2d;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * Difference between two boolean[]'s.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.Point2dDifferenceTest")
 public class Point2dDifference extends AbstractDifferenceList implements IDifferenceList {
 
     private String name;
@@ -38,6 +42,7 @@
         this.name = name;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, Point2d first, Point2d second) {
         if (first == null && second == null) return null;
         

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point3dDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point3dDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/Point3dDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -24,12 +24,16 @@
 
 import javax.vecmath.Point3d;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * Difference between two boolean[]'s.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.Point3dDifferenceTest")
 public class Point3dDifference extends AbstractDifferenceList implements IDifferenceList {
 
     private String name;
@@ -38,6 +42,7 @@
         this.name = name;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, Point3d first, Point3d second) {
         if (first == null && second == null) return null;
         

Modified: cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/StringDifference.java
===================================================================
--- cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/StringDifference.java	2008-06-29 07:49:16 UTC (rev 11456)
+++ cdk/branches/egonw-diff/src/main/org/openscience/cdk/tools/diff/tree/StringDifference.java	2008-06-29 08:35:58 UTC (rev 11457)
@@ -20,12 +20,16 @@
  */
 package org.openscience.cdk.tools.diff.tree;
 
+import org.openscience.cdk.annotations.TestClass;
+import org.openscience.cdk.annotations.TestMethod;
+
 /**
  * {@link IDifference} between two {@link String}.
  * 
  * @author     egonw
  * @cdk.module diff
  */
+@TestClass("org.openscience.cdk.tools.diff.tree.StringDifferenceTest")
 public class StringDifference implements IDifference {
 
     private String name;
@@ -38,6 +42,7 @@
         this.second = second;
     }
     
+    @TestMethod("testDiff,testSame,testTwoNull,testOneNull")
     public static IDifference construct(String name, String first, String second) {
         if (first == null && second == null) {
             return null; // no difference


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.