ruper2/src/test/core/org/krysalis/ruper2/util/select CompositeSelectorTests.java,1.2,1.3 SelectionTests.java,1.1,1.2 MockSelector.java,1.1,1.2

Update of /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/util/select
In directory sc8-pr-cvs1:/tmp/cvs-serv13477/src/test/core/org/krysalis/ruper2/util/select

Modified Files:
	CompositeSelectorTests.java SelectionTests.java 
	MockSelector.java 
Log Message:
Consistency changes, interfaces starting with I --- retry commit.

Index: CompositeSelectorTests.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/util/select/CompositeSelectorTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompositeSelectorTests.java	2 Oct 2003 23:56:50 -0000	1.2
--- CompositeSelectorTests.java	9 Oct 2003 14:05:35 -0000	1.3
***************
*** 40,44 ****
       */
      public void testAddDuplicate() {
!         Selector child = new MockSelector();
          boolean result = m_selector.addSelector( child );
          assertTrue("Add should succeed", result);
--- 40,44 ----
       */
      public void testAddDuplicate() {
!         ISelector child = new MockSelector();
          boolean result = m_selector.addSelector( child );
          assertTrue("Add should succeed", result);
***************
*** 65,69 ****
       */
      public void testChildOrder() {
!         Selector children[] = new Selector[3];
          for (int i = 0; i < children.length; i++) {
              children[i] = new MockSelector();
--- 65,69 ----
       */
      public void testChildOrder() {
!         ISelector children[] = new ISelector[3];
          for (int i = 0; i < children.length; i++) {
              children[i] = new MockSelector();
***************
*** 74,78 ****
          Iterator childIter = m_selector.childIterator();
          while (childIter.hasNext()) {
!             Selector selector = (Selector) childIter.next();
              assertEquals( "Child " + Integer.toString( count ) + " selector should be in same order", children[count], selector );
              count++;
--- 74,78 ----
          Iterator childIter = m_selector.childIterator();
          while (childIter.hasNext()) {
!             ISelector selector = (ISelector) childIter.next();
              assertEquals( "Child " + Integer.toString( count ) + " selector should be in same order", children[count], selector );
              count++;
***************
*** 91,95 ****
  
          for( int i=0; i<4; i++  ) {
!             Selector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
--- 91,95 ----
  
          for( int i=0; i<4; i++  ) {
!             ISelector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
***************
*** 118,122 ****
  
          for( int i=0; i<4; i++  ) {
!             Selector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
--- 118,122 ----
  
          for( int i=0; i<4; i++  ) {
!             ISelector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
***************
*** 141,145 ****
  
          for( int i=0; i<4; i++  ) {
!             Selector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
--- 141,145 ----
  
          for( int i=0; i<4; i++  ) {
!             ISelector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
***************
*** 158,162 ****
  
          for( int i=0; i<4; i++  ) {
!             Selector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );
--- 158,162 ----
  
          for( int i=0; i<4; i++  ) {
!             ISelector child = new MockSelector();
              m_selector.addSelector( child );
              testSelector.addSelector( child );

Index: SelectionTests.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/util/select/SelectionTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectionTests.java	29 Sep 2003 18:09:17 -0000	1.1
--- SelectionTests.java	9 Oct 2003 14:05:35 -0000	1.2
***************
*** 59,67 ****
  	}
  
! 	public boolean selectedSomethingFrom(List stuff, Selector selector) {
  		return 0 < selectionCount(stuff, selector);
  	}
  
! 	public int selectionCount(List stuff, Selector selector) {
  		List selected = SelectionHelper.select(stuff, selector);
  		return selected.size();
--- 59,67 ----
  	}
  
! 	public boolean selectedSomethingFrom(List stuff, ISelector selector) {
  		return 0 < selectionCount(stuff, selector);
  	}
  
! 	public int selectionCount(List stuff, ISelector selector) {
  		List selected = SelectionHelper.select(stuff, selector);
  		return selected.size();

Index: MockSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/util/select/MockSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MockSelector.java	29 Sep 2003 18:09:17 -0000	1.1
--- MockSelector.java	9 Oct 2003 14:05:35 -0000	1.2
***************
*** 7,11 ****
   * @author Ben Sommerville
   */
! public class MockSelector implements Selector {
      boolean m_result = false;
  
--- 7,11 ----
   * @author Ben Sommerville
   */
! public class MockSelector implements ISelector {
      boolean m_result = false;
  




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php