[Tinyos-2-commits] CVS: tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestStateC TestStateC.nc, 1.1, 1.2 TestStateP.nc, 1.1, 1.2 suite.properties, 1.1, 1.2

[David Moss]

Update of /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestStateC
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32423

Modified Files:
	TestStateC.nc TestStateP.nc suite.properties 
Log Message:
Clean up

Index: TestStateC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestStateC/TestStateC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStateC.nc	22 Jul 2007 05:32:42 -0000	1.1
--- TestStateC.nc	14 Jan 2008 20:45:16 -0000	1.2
***************
*** 46,51 ****
    
    TestStateP.State -> StateC;
!   TestStateP.SetUpOneTime -> TestForceC.SetUpOneTime;
!   TestStateP.TearDownOneTime -> TestForceC.TearDownOneTime;
    
    TestStateP.TestForce -> TestForceC;
--- 46,50 ----
    
    TestStateP.State -> StateC;
!   TestStateP.SetUp -> TestForceC.SetUp;
    
    TestStateP.TestForce -> TestForceC;

Index: TestStateP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestStateC/TestStateP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStateP.nc	22 Jul 2007 05:32:42 -0000	1.1
--- TestStateP.nc	14 Jan 2008 20:45:16 -0000	1.2
***************
*** 44,49 ****
      interface State;
      
!     interface TestControl as SetUpOneTime;
!     interface TestControl as TearDownOneTime;
      
      interface TestCase as TestForce;
--- 44,48 ----
      interface State;
      
!     interface TestControl as SetUp;
      
      interface TestCase as TestForce;
***************
*** 69,81 ****
    
    /***************** SetUpOneTime Events ***************/
!   event void SetUpOneTime.run() {
!     call State.toIdle();
!     call SetUpOneTime.done();
!   }
!   
!   /***************** TearDownOneTime Events ***************/
!   event void TearDownOneTime.run() {
      call State.toIdle();
!     call TearDownOneTime.done();
    }
  
--- 68,74 ----
    
    /***************** SetUpOneTime Events ***************/
!   event void SetUp.run() {
      call State.toIdle();
!     call SetUp.done();
    }
  

Index: suite.properties
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestStateC/suite.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** suite.properties	22 Jul 2007 05:32:43 -0000	1.1
--- suite.properties	14 Jan 2008 20:45:16 -0000	1.2
***************
*** 2,5 ****
--- 2,6 ----
   * Valid keywords are:
   *  @author <optional author(s)>  (multiple)
+  *  @assertions <max number of assertions expected in a single TestCase>
   *  @testname <optional testname>  (once)
   *  @description <optional, multiline description>  (once)
***************
*** 15,21 ****
   */
  
- @testname Test StateC
- @author David Moss
- @description Tests some different boundaries of the State component.  We may
- need some more tests to cover all the cases, like atomic state changing.
  @exactnodes 1
\ No newline at end of file
--- 16,18 ----