[Tinyos-2-commits] CVS: tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestFcfsArbiterC TestFcfsArbiterC.nc, 1.1, 1.2 TestFcfsArbiterP.nc, 1.1, 1.2

[Kevin Klues]

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

Modified Files:
	TestFcfsArbiterC.nc TestFcfsArbiterP.nc 
Log Message:
Oops.....

Index: TestFcfsArbiterC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestFcfsArbiterC/TestFcfsArbiterC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestFcfsArbiterC.nc	26 Sep 2007 16:58:00 -0000	1.1
--- TestFcfsArbiterC.nc	26 Sep 2007 19:05:58 -0000	1.2
***************
*** 53,58 ****
    //Tunit Test cases 
    components new TestCaseC() as TestFcfsOrderC;
-   TestFcfsArbiterP.SetUpOneTime -> TestFcfsOrderC.SetUpOneTime;
-   TestFcfsArbiterP.TearDownOneTime -> TestFcfsOrderC.TearDownOneTime;
    TestFcfsArbiterP.TestFcfsOrder -> TestFcfsOrderC;
  }
--- 53,56 ----

Index: TestFcfsArbiterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/system/TestFcfsArbiterC/TestFcfsArbiterP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestFcfsArbiterP.nc	26 Sep 2007 16:58:01 -0000	1.1
--- TestFcfsArbiterP.nc	26 Sep 2007 19:05:58 -0000	1.2
***************
*** 44,49 ****
  
      interface TestCase as TestFcfsOrder; 
-     interface TestControl as SetUpOneTime;
-     interface TestControl as TearDownOneTime;
    }
  }
--- 44,47 ----
***************
*** 52,63 ****
    uint8_t resource;
  
-   event void SetUpOneTime.run() {
-     call SetUpOneTime.done();
-   }
- 
-   event void TearDownOneTime.run() {
-     call TearDownOneTime.done();
-   }
-   
    //All resources try to gain access
    event void TestFcfsOrder.run() {
--- 50,53 ----
***************
*** 76,79 ****
--- 66,70 ----
    event void Resource1.granted() {
      assertEquals("Resource Granted Out of Order: 1", resource, 1);
+     call Resource1.release();
      call TestFcfsOrder.done();
    }  
***************
*** 81,85 ****
      assertEquals("Resource Granted Out of Order: 2", resource, 2);
      resource = 1;
!     call Resource0.release();
    }  
  }
--- 72,76 ----
      assertEquals("Resource Granted Out of Order: 2", resource, 2);
      resource = 1;
!     call Resource2.release();
    }  
  }