[Cdk-commits] SF.net SVN: cdk: [9553] branches/miguelrojasch/mf/src/org/openscience/cdk/ test/formula/MolecularFormulaCheckerTest.java

[<mig...@us...>]

Revision: 9553
          http://cdk.svn.sourceforge.net/cdk/?rev=9553&view=rev
Author:   miguelrojasch
Date:     2007-12-03 00:16:35 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
some breaks by the commit

Modified Paths:
--------------
    branches/miguelrojasch/mf/src/org/openscience/cdk/test/formula/MolecularFormulaCheckerTest.java

Modified: branches/miguelrojasch/mf/src/org/openscience/cdk/test/formula/MolecularFormulaCheckerTest.java
===================================================================
--- branches/miguelrojasch/mf/src/org/openscience/cdk/test/formula/MolecularFormulaCheckerTest.java	2007-12-03 06:30:19 UTC (rev 9552)
+++ branches/miguelrojasch/mf/src/org/openscience/cdk/test/formula/MolecularFormulaCheckerTest.java	2007-12-03 08:16:35 UTC (rev 9553)
@@ -29,6 +29,7 @@
 import org.openscience.cdk.DefaultChemObjectBuilder;
 import org.openscience.cdk.config.IsotopeFactory;
 import org.openscience.cdk.formula.IMolecularFormula;
+import org.openscience.cdk.formula.MolecularFormula;
 import org.openscience.cdk.formula.MolecularFormulaChecker;
 import org.openscience.cdk.formula.rules.ChargeRule;
 import org.openscience.cdk.formula.rules.IRule;
@@ -68,7 +69,7 @@
 	 */
     public static Test suite() {
     	
-        TestSuite suite = new TestSuite(MolecularFormulaCheckerTest.class);
+        TestSuite suite = new TestSuite(MolecularFormulaCheckerTest_cp.class);
         return suite;
 	}
     
@@ -100,17 +101,17 @@
 	 */
 	public void testIsValidSum_NOT(){
 		
-		IMolecularFormula formula = builder.newMolecularFormula();
+		IMolecularFormula formula = new MolecularFormula();
 		formula.addIsotope(ifac.getMajorIsotope("C"),1);
 		formula.addIsotope( ifac.getMajorIsotope("H"),100);
-        
-		List<IRule> rules = new ArrayList<IRule>();
-		rules.add(new MMElementRule());
-		
-		MolecularFormulaChecker MFChecker =new MolecularFormulaChecker(rules);
     	
 		
-        assertEquals(0.0,MFChecker.isValidSum(formula));
+		 List<IRule> rules = new ArrayList<IRule>();
+		 rules.add(new MMElementRule());
+		 
+		 MolecularFormulaChecker MFChecker =new MolecularFormulaChecker(rules);
+		 
+		 assertEquals(0.0,MFChecker.isValidSum(formula));
 
 	}
 	/**
@@ -120,7 +121,7 @@
 	 */
 	public void testIsValid_NOT(){
 		
-		IMolecularFormula formula = builder.newMolecularFormula();
+		IMolecularFormula formula = new MolecularFormula();
 		formula.addIsotope(ifac.getMajorIsotope("C"),1);
 		formula.addIsotope( ifac.getMajorIsotope("H"),100);
         
@@ -142,7 +143,7 @@
 	 */
 	public void testIsValidSum_NOT_2Rules(){
 		
-		IMolecularFormula formula = builder.newMolecularFormula();
+		IMolecularFormula formula = new MolecularFormula();
 		formula.addIsotope(ifac.getMajorIsotope("C"),1);
 		formula.addIsotope( ifac.getMajorIsotope("H"),100);
         formula.setCharge(0.0);
@@ -164,7 +165,7 @@
 	 */
 	public void testIsValid_NOT_2Rules(){
 
-		IMolecularFormula formula = builder.newMolecularFormula();
+		IMolecularFormula formula = new MolecularFormula();
 		formula.addIsotope(ifac.getMajorIsotope("C"),1);
 		formula.addIsotope( ifac.getMajorIsotope("H"),100);
         formula.setCharge(0.0);
@@ -188,7 +189,7 @@
 	 */
 	public void testIsValidSum_True_2Rules(){
 		
-		IMolecularFormula formula = builder.newMolecularFormula();
+		IMolecularFormula formula = new MolecularFormula();
 		formula.addIsotope(ifac.getMajorIsotope("C"),1);
 		formula.addIsotope( ifac.getMajorIsotope("H"),4);
         formula.setCharge(0.0);
@@ -210,7 +211,7 @@
 	 */
 	public void testIsValid_True_2Rules(){
 
-		IMolecularFormula formula = builder.newMolecularFormula();
+		IMolecularFormula formula = new MolecularFormula();
 		formula.addIsotope(ifac.getMajorIsotope("C"),1);
 		formula.addIsotope( ifac.getMajorIsotope("H"),4);
         formula.setCharge(0.0);
@@ -227,6 +228,5 @@
         assertEquals(1.0,formulaWith.getProperty((new ChargeRule()).getClass()));
 
 	}
-	
 }
 


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