[jgatms-devl] jgatms-core/src/test/inklings/jgatms/command GetSkillLevelsTest.java,NONE,1.1 AddMemberTest.java,1.1,1.2 AddResponseToQuestionTest.java,1.2,1.3 BaseTestCase.java,1.1.1.1,1.2 GetMemberListTest.java,1.2,1.3 GetQuestionTest.java,1.2,1.3 GetQuestionsTest.java,1.2,1.3 GetResponsesTest.java,1.2,1.3 GetSkillsListTest.java,1.2,1.3

[Greg R. <gr...@us...>]

Update of /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3496/src/test/inklings/jgatms/command

Modified Files:
	AddMemberTest.java AddResponseToQuestionTest.java 
	BaseTestCase.java GetMemberListTest.java GetQuestionTest.java 
	GetQuestionsTest.java GetResponsesTest.java 
	GetSkillsListTest.java 
Added Files:
	GetSkillLevelsTest.java 
Log Message:
Added tests for AddMember and GetSkillLevels.  Also added the assertSuccess() method to BaseTestCase to help validate the dispatch codes returned from commands.

Index: GetSkillsListTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/GetSkillsListTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetSkillsListTest.java	1 Apr 2004 23:01:36 -0000	1.2
--- GetSkillsListTest.java	6 Apr 2004 22:52:25 -0000	1.3
***************
*** 31,36 ****
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
  
          List skills = (List) context.get(ContextKeys.SKILL_LIST_KEY);
--- 31,35 ----
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
  
          List skills = (List) context.get(ContextKeys.SKILL_LIST_KEY);

Index: AddMemberTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/AddMemberTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddMemberTest.java	6 Apr 2004 21:00:15 -0000	1.1
--- AddMemberTest.java	6 Apr 2004 22:52:25 -0000	1.2
***************
*** 2,5 ****
--- 2,8 ----
  package inklings.jgatms.command;
  
+ import java.util.List;
+ import java.util.ArrayList;
+ 
  import org.apache.commons.chain.Command;
  import org.apache.commons.chain.Context;
***************
*** 7,10 ****
--- 10,14 ----
  
  import inklings.jgatms.bean.Member;
+ import inklings.jgatms.bean.State;
  import inklings.jgatms.CommandKeys;
  import inklings.jgatms.ContextKeys;
***************
*** 22,35 ****
  
          JgatmsContext context = new JgatmsContext();
!         Command command = catalog.getCommand(CommandKeys.ADD_MEMBER);
          assertNotNull(CommandKeys.ADD_MEMBER + " not found", command);
  
          Member member = new Member();
  
          context.setMember(member);
          command.execute(context);
!         String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
      }
  }
--- 26,78 ----
  
          JgatmsContext context = new JgatmsContext();
!         Command command = catalog.getCommand(CommandKeys.GET_SKILLS_LIST);
!         assertNotNull(CommandKeys.GET_SKILLS_LIST + " not found.", command);
! 
!         command.execute(context);
!         String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
! 
!         List skills = (List) context.get(ContextKeys.SKILL_LIST_KEY);
!         assertNotNull(ContextKeys.SKILL_LIST_KEY + " not found.", skills);
! 
!         command = catalog.getCommand(CommandKeys.ADD_MEMBER);
          assertNotNull(CommandKeys.ADD_MEMBER + " not found", command);
  
          Member member = new Member();
+         member.setFirstName("MaryLou");
+         member.setLastName("Johamous");
+         member.setGender("M");
+         member.setAddress1("123 Some St.");
+         member.setAddress2("Apt A");
+         member.setCity("Texarkana");
+         State state = new State();
+         state.setStateId("AR");
+         member.setState(state);
+         member.setZipCode("72134");
+         member.setHomePhone("(501) 514-1234");
+         member.setWorkPhone("(501) 514-4567");
+         member.setMobilePhone("(501) 514-8972");
+         member.setPreferredPhone("M");
+         member.setEmailAddress("on...@th...");
+         member.setUserName("user1");
+         member.setPassword("user1");
+ 
+ /*
+         Work in progress on adding skill Profiles.
+ 
+         List skillProfiles = new ArrayList();
+         SkillProfile skillProfile = new SkillProfile();
+ 
+         Skill skill = (Skill) skills.get(0);
+         SkillLevel skillLevel = new SkillLevel();
+         skillLevel.setLevelId(0);
+         skillProfile.setSkill(skill);
+         skillProfile.setSkillLevel(skillLevel);
+ */
  
          context.setMember(member);
          command.execute(context);
!         dispatch = context.getDispatch();
!         assertSuccess(dispatch);
      }
  }

Index: GetQuestionTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/GetQuestionTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetQuestionTest.java	1 Apr 2004 23:01:36 -0000	1.2
--- GetQuestionTest.java	6 Apr 2004 22:52:25 -0000	1.3
***************
*** 31,36 ****
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
  
          Question question = (Question) context.get(ContextKeys.QUESTION_KEY);
--- 31,35 ----
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
  
          Question question = (Question) context.get(ContextKeys.QUESTION_KEY);

Index: AddResponseToQuestionTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/AddResponseToQuestionTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddResponseToQuestionTest.java	1 Apr 2004 23:01:36 -0000	1.2
--- AddResponseToQuestionTest.java	6 Apr 2004 22:52:25 -0000	1.3
***************
*** 33,38 ****
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
  
          Question question = (Question) context.get(ContextKeys.QUESTION_KEY);
--- 33,37 ----
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
  
          Question question = (Question) context.get(ContextKeys.QUESTION_KEY);
***************
*** 49,54 ****
          command.execute(context);
          dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
      }
  }
--- 48,52 ----
          command.execute(context);
          dispatch = context.getDispatch();
!         assertSuccess(dispatch);
      }
  }

Index: GetMemberListTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/GetMemberListTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetMemberListTest.java	1 Apr 2004 23:01:36 -0000	1.2
--- GetMemberListTest.java	6 Apr 2004 22:52:25 -0000	1.3
***************
*** 37,42 ****
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
  
          List members = (List) context.get(ContextKeys.MEMBER_LIST_KEY);
--- 37,41 ----
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
  
          List members = (List) context.get(ContextKeys.MEMBER_LIST_KEY);

--- NEW FILE: GetSkillLevelsTest.java ---

package inklings.jgatms.command;

import java.util.List;
import java.util.Iterator;

import org.apache.commons.chain.Command;
import org.apache.commons.chain.Context;
import org.apache.commons.chain.impl.ContextBase;

import inklings.jgatms.context.JgatmsContext;
import inklings.jgatms.CommandKeys;
import inklings.jgatms.ContextKeys;
import inklings.jgatms.bean.SkillLevel;

/**
 * Tests the <code>GetSkillLevels</code> JGATMS command.
 */
public class GetSkillLevelsTest extends BaseTestCase {

    /**
     * Verifies that the list of levels can be retrieved.
     */
    public void testGetSkillLevels() throws Exception {

        JgatmsContext context = new JgatmsContext();
        Command command = catalog.getCommand(CommandKeys.GET_SKILL_LEVELS);
        assertNotNull(CommandKeys.GET_SKILL_LEVELS + " not found", command);

        command.execute(context);
        String dispatch = context.getDispatch();
        assertSuccess(dispatch);

        List skillLevels = (List) context.get(ContextKeys.SKILL_LEVELS_KEY);
        assertNotNull(ContextKeys.SKILL_LEVELS_KEY + " not found.", skillLevels);

        Iterator i = skillLevels.iterator();
        while (i.hasNext()) {
            SkillLevel skillLevel = (SkillLevel) i.next();
            System.out.println("LevelId: " + skillLevel.getLevelId());
            System.out.println("LevelName: " + skillLevel.getDescription());
            System.out.println("=================================="); 
        }
    }
}

Index: GetQuestionsTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/GetQuestionsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetQuestionsTest.java	1 Apr 2004 23:01:36 -0000	1.2
--- GetQuestionsTest.java	6 Apr 2004 22:52:25 -0000	1.3
***************
*** 30,35 ****
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
  
          List questions = (List) context.get(ContextKeys.QUESTION_LIST_KEY);
--- 30,34 ----
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
  
          List questions = (List) context.get(ContextKeys.QUESTION_LIST_KEY);

Index: BaseTestCase.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/BaseTestCase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseTestCase.java	29 Jan 2004 23:38:37 -0000	1.1.1.1
--- BaseTestCase.java	6 Apr 2004 22:52:25 -0000	1.2
***************
*** 11,14 ****
--- 11,16 ----
  import org.apache.commons.chain.config.ConfigParser;
  
+ import inklings.jgatms.ContextKeys;
+ 
  /**
   * Base test case for JGATMS commands.
***************
*** 30,32 ****
--- 32,39 ----
      }
  
+     protected void assertSuccess(String dispatch) {
+         assertTrue("Unsuccessful command execution.", 
+                 (dispatch == null || dispatch.equals(ContextKeys.SUCCESS_DISPATCH)) );
+     }
+ 
  }

Index: GetResponsesTest.java
===================================================================
RCS file: /cvsroot/jgatms/jgatms-core/src/test/inklings/jgatms/command/GetResponsesTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetResponsesTest.java	1 Apr 2004 23:01:36 -0000	1.2
--- GetResponsesTest.java	6 Apr 2004 22:52:25 -0000	1.3
***************
*** 30,35 ****
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertTrue("Unsuccessful command execution.", 
!                 dispatch.equals(ContextKeys.SUCCESS_DISPATCH));
  
          List responses = (List) context.get(ContextKeys.RESPONSE_LIST_KEY);
--- 30,34 ----
          command.execute(context);
          String dispatch = context.getDispatch();
!         assertSuccess(dispatch);
  
          List responses = (List) context.get(ContextKeys.RESPONSE_LIST_KEY);