[TCO-Tool_cvs] TCO-Tool/test/org/tcotool/tools/test ModelUtilityTestCase.java, 1.2, 1.3 TcoTestSuite.java, 1.1.1.1, 1.2 TestModel.java, 1.3, 1.4 CalculatorTestCase.java, 1.2, 1.3

[Hirzel P. <ph...@us...>]

Update of /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29379/test/org/tcotool/tools/test

Modified Files:
	ModelUtilityTestCase.java TcoTestSuite.java TestModel.java 
	CalculatorTestCase.java 
Log Message:
Release V1.4.4

Index: ModelUtilityTestCase.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/ModelUtilityTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModelUtilityTestCase.java	7 May 2006 14:59:35 -0000	1.2
--- ModelUtilityTestCase.java	13 Jun 2007 20:19:50 -0000	1.3
***************
*** 41,45 ****
--- 41,47 ----
      }
      public void tearDown() {
+ //      javax.jdo.PersistenceManagerFactory factory = m.server.getPersistenceManagerFactory();
          m.server.close();
+ //      factory.close();
      }
      public void testTcoModel() {

Index: TestModel.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/TestModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestModel.java	7 May 2006 14:59:35 -0000	1.3
--- TestModel.java	13 Jun 2007 20:19:50 -0000	1.4
***************
*** 10,14 ****
  
  import ch.softenvironment.jomm.DbObjectServer;
- import ch.softenvironment.util.DeveloperException;
  
  /*
--- 10,13 ----
***************
*** 44,53 ****
  
      private DbObjectServer initializeDatabase() {
-         try {
- 	       org.tcotool.TcotoolUtility.registerClasses();
-         } catch(DeveloperException e) {
- //TODO hack against static re-evalution => use JUnit TestSetup instead
-             // ignore: re-Registering caused by TestCase#setUp()
-         }
  		javax.jdo.PersistenceManagerFactory pmFactory = new ch.softenvironment.jomm.target.xml.XmlObjectServerFactory();
  		pmFactory.setConnectionURL("tcotool.model");
--- 43,46 ----
***************
*** 55,59 ****
  	//	pmFactory.setNontransactionalWrite(false);	// NO autoCommit while writing
  	
! 		return (DbObjectServer)pmFactory.getPersistenceManager(System.getProperty("user.name"), null);
    	}
      public TestModel() throws Throwable {
--- 48,54 ----
  	//	pmFactory.setNontransactionalWrite(false);	// NO autoCommit while writing
  	
! 		DbObjectServer server = (DbObjectServer)pmFactory.getPersistenceManager(System.getProperty("user.name"), null);
!         org.tcotool.TcotoolUtility.registerClasses(server);
!         return server;
    	}
      public TestModel() throws Throwable {

Index: TcoTestSuite.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/TcoTestSuite.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TcoTestSuite.java	29 Aug 2005 09:41:17 -0000	1.1.1.1
--- TcoTestSuite.java	13 Jun 2007 20:19:50 -0000	1.2
***************
*** 16,21 ****
   */
  
! import org.tcotool.standard.report.test.ReportToolTestCase;
! 
  import ch.softenvironment.util.Tracer;
  
--- 16,21 ----
   */
  
! import ch.softenvironment.tcotool.benchmark.test.InterviewMaschineTestCase;
! import ch.softenvironment.tcotool.vbs.test.DepreciationCalculatorTestCase;
  import ch.softenvironment.util.Tracer;
  
***************
*** 48,56 ****
       */
      public static junit.framework.Test suite() {
!     	TestSuite suite =  new TestSuite("Tco-Tool tests");
      	suite.addTest(new TestSuite(ModelUtilityTestCase.class));
      	suite.addTest(new TestSuite(CalculatorTestCase.class));
!     	suite.addTest(new TestSuite(ReportToolTestCase.class));
!     	
      	return suite;
      }
--- 48,57 ----
       */
      public static junit.framework.Test suite() {
!     	TestSuite suite = new TestSuite("TCO-Tool tests");
      	suite.addTest(new TestSuite(ModelUtilityTestCase.class));
      	suite.addTest(new TestSuite(CalculatorTestCase.class));
!         suite.addTest(new TestSuite(DepreciationCalculatorTestCase.class));
!         suite.addTest(new TestSuite(InterviewMaschineTestCase.class));
! //TODO include suite.addTest(new XmlMapperSuite());
      	return suite;
      }

Index: CalculatorTestCase.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/CalculatorTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CalculatorTestCase.java	7 May 2006 14:59:35 -0000	1.2
--- CalculatorTestCase.java	13 Jun 2007 20:19:50 -0000	1.3
***************
*** 16,20 ****
   */
  
- import org.tcotool.model.FactCost;
  import org.tcotool.model.PersonalCost;
  import org.tcotool.model.TcoObject;
--- 16,19 ----
***************
*** 22,27 ****
  import org.tcotool.tools.ModelUtility;
  
- import ch.softenvironment.math.MathUtils;
- 
  import junit.framework.TestCase;
  
--- 21,24 ----
***************
*** 49,53 ****
--- 46,52 ----
      }
      public void tearDown() {
+ //      javax.jdo.PersistenceManagerFactory factory = m.server.getPersistenceManagerFactory();
          m.server.close();
+ //      factory.close();
      }
      public void testMultitudeFactor() {