Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added testing #3

Open
wants to merge 85 commits into
base: master
Choose a base branch
from
Open

Added testing #3

wants to merge 85 commits into from

Commits on Apr 15, 2019

  1. I have added a folder for tests and created a new class for the tests - 

    Also added the jar files for hamcrest junit and mockito
    DellUser authored and DellUser committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    3f8f40f View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. Added new advance() Method to include arr of Zombies for test only

    DellUser authored and DellUser committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    88e1c4e View commit details
    Browse the repository at this point in the history

  2. These are added so Mockito will work

    DellUser authored and DellUser committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    551d83a View commit details
    Browse the repository at this point in the history

  3. Includes .advance() method

    DellUser authored and DellUser committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    03e6d85 View commit details
    Browse the repository at this point in the history

  4. updated classpath

    DellUser authored and DellUser committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    b4f84d4 View commit details
    Browse the repository at this point in the history

  5. Added test to ensure is in test harness

    DellUser authored and DellUser committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    d3cff6e View commit details
    Browse the repository at this point in the history

  6. Added additional advance() method for testing - includes a Zombie []

    DellUser authored and DellUser committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    5620a4f View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. New Tests include normal .advance() method and the one with Zombie[]

    DellUser authored and DellUser committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    c411b24 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2019

  1. Added logic for new method

    DellUser authored and DellUser committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    29a26df View commit details
    Browse the repository at this point in the history

  2. Added logic for testAdvance method

    PickNatchen authored and PickNatchen committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    cada06e View commit details
    Browse the repository at this point in the history

  3. Added new tests

    PickNatchen authored and PickNatchen committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    e52fcf6 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2019

  1. Using the Extract Interface pattern

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    8830352 View commit details
    Browse the repository at this point in the history

  2. There were changes to the name of GamePanel in all of these classes to 

    GamePanelActual
    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    17d4381 View commit details
    Browse the repository at this point in the history

  3. Created new GamePanel Interface for testing

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    49ba872 View commit details
    Browse the repository at this point in the history

  4. Added new unimplemented methods (.add and .remove)

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    bf09b73 View commit details
    Browse the repository at this point in the history

  5. For all of these classes, needed to change the type from GamePanelActual 

    to just GamePanel
    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    7c8c62d View commit details
    Browse the repository at this point in the history

  6. Added methods so can compile

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    c104b58 View commit details
    Browse the repository at this point in the history

  7. Added .add and .remove methods

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    12c4afe View commit details
    Browse the repository at this point in the history

  8. Updated Name so we can differentiate between George's and Nick's testing

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    658e424 View commit details
    Browse the repository at this point in the history

  9. Changed the constructor from taking GamePanelActual to GamePanel

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    75e50cd View commit details
    Browse the repository at this point in the history

  10. Testing commit - no actual testing done yet

    gharr authored and gharr committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    f275a79 View commit details
    Browse the repository at this point in the history

  11. testing commit/push

    gharr authored and gharr committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    da20edf View commit details
    Browse the repository at this point in the history

  12. Removed the extra testAdvance method

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    dd76a09 View commit details
    Browse the repository at this point in the history

  13. Added methods to create zombie list and create zombies

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    393b881 View commit details
    Browse the repository at this point in the history

  14. Added new methods to create LanePea Array list

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    bf362ad View commit details
    Browse the repository at this point in the history

  15. Merge pull request #1 from pickNatchen/NickBranch 

    Added new methods to create LanePea Array list
    @pickNatchen
    pickNatchen authored Apr 22, 2019
    Configuration menu
    Copy the full SHA
    b33a803 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #2 from pickNatchen/George 

    George
    @pickNatchen
    pickNatchen authored Apr 22, 2019
    Configuration menu
    Copy the full SHA
    8c63ac7 View commit details
    Browse the repository at this point in the history

  17. Removed testAdvance method - not needed

    PickNatchen authored and PickNatchen committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    6add6ce View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2019

  1. Added correct code for removing Pea, but is commented out

    PickNatchen authored and PickNatchen committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    e3d9759 View commit details
    Browse the repository at this point in the history

  2. Added correct code for removing Pea (PeaList), is commented out

    PickNatchen authored and PickNatchen committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    ea43576 View commit details
    Browse the repository at this point in the history

  3. Added tests that collide a Zombie and Pea

    PickNatchen authored and PickNatchen committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    78e95bd View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

  1. Merge pull request #3 from pickNatchen/NickBranch 

    Removed testAdvance method - not needed
    @pickNatchen
    pickNatchen authored Apr 24, 2019
    Configuration menu
    Copy the full SHA
    7146ab9 View commit details
    Browse the repository at this point in the history

  2. This includes tests for FreezePea class

    PickNatchen authored and PickNatchen committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    bee8d9a View commit details
    Browse the repository at this point in the history

  3. Added tests for the setters and getters in Pea and FreezePea

    PickNatchen authored and PickNatchen committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    5bfc58c View commit details
    Browse the repository at this point in the history

  4. Removed old testAdvance method - no longer valid

    PickNatchen authored and PickNatchen committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    39e7490 View commit details
    Browse the repository at this point in the history

  5. This has all of the updated tests

    PickNatchen authored and PickNatchen committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    a755d63 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored Apr 24, 2019
    Configuration menu
    Copy the full SHA
    ed0a7b5 View commit details
    Browse the repository at this point in the history

  7. 4/23 Commit - Sun and LevelData testing 

    Test Plan documentation complete, but not yet uploaded.
    gharr authored and gharr committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    04144df View commit details
    Browse the repository at this point in the history

  8. Update GeorgeTests.java

    @gharrington1996
    gharrington1996 authored Apr 24, 2019
    Configuration menu
    Copy the full SHA
    f680c1b View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5 from pickNatchen/George 

    George
    @gharrington1996
    gharrington1996 authored Apr 24, 2019
    Configuration menu
    Copy the full SHA
    4623f1d View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2019

  1. Removed Collider class and added collider interface using extract 

    interface
    PickNatchen authored and PickNatchen committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    28d58d1 View commit details
    Browse the repository at this point in the history

  2. This is the original Collider Class

    PickNatchen authored and PickNatchen committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    5ccfc8d View commit details
    Browse the repository at this point in the history

  3. Added a getPlant() method to replace the .assignedPlant public variable

    PickNatchen authored and PickNatchen committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    9177c8a View commit details
    Browse the repository at this point in the history

  4. Changed the collided.assignedPlant to collided.getPlant()

    PickNatchen authored and PickNatchen committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    444fdd8 View commit details
    Browse the repository at this point in the history

  5. Added getPlant() method that returns the assignedPlant for the collider 

    also made the assignedPlant private
    PickNatchen authored and PickNatchen committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    d5b72d9 View commit details
    Browse the repository at this point in the history

  6. Created ColliderTesting Class and stubbed all methods

    PickNatchen authored and PickNatchen committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    cadadc8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #6 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored Apr 29, 2019
    Configuration menu
    Copy the full SHA
    d7f4dd0 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. added tests for the collider class

    PickNatchen authored and PickNatchen committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    984c189 View commit details
    Browse the repository at this point in the history

  2. No changes - It's requring me to commit for some reason..

    PickNatchen authored and PickNatchen committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    70358a3 View commit details
    Browse the repository at this point in the history

  3. Added a couple tests for GamePanel

    PickNatchen authored and PickNatchen committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    c4134d7 View commit details
    Browse the repository at this point in the history

  4. Added two tests for GameWindow

    PickNatchen authored and PickNatchen committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    6a472a8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored Apr 30, 2019
    Configuration menu
    Copy the full SHA
    d2d8380 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. Needed to change the GamePanelActual to GamePanelTesting

    PickNatchen authored and PickNatchen committed May 2, 2019
    Configuration menu
    Copy the full SHA
    0e84d29 View commit details
    Browse the repository at this point in the history

  2. Created Zombie Class tests - instantiate and .getZombie() method

    PickNatchen authored and PickNatchen committed May 2, 2019
    Configuration menu
    Copy the full SHA
    3e93d1e View commit details
    Browse the repository at this point in the history

  3. One of the set methods took a GamePanelActual as a param, now testing

    PickNatchen authored and PickNatchen committed May 2, 2019
    Configuration menu
    Copy the full SHA
    ab82c1b View commit details
    Browse the repository at this point in the history

  4. Added Setter and Getter Tests for Zombie Class

    PickNatchen authored and PickNatchen committed May 2, 2019
    Configuration menu
    Copy the full SHA
    889136f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. Used extract method, to create a seam to test plant health changing

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    78d58e0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored May 8, 2019
    Configuration menu
    Copy the full SHA
    aa344f3 View commit details
    Browse the repository at this point in the history

  3. Extracted Method to make it easier to test that functionality

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    7219699 View commit details
    Browse the repository at this point in the history

  4. Changed some of the stub methods

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    8e4a875 View commit details
    Browse the repository at this point in the history

  5. Changed stub methods

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5cde3ea View commit details
    Browse the repository at this point in the history

  6. Added Zombie.advance() tests

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    a4cd4f6 View commit details
    Browse the repository at this point in the history

  7. Added final tests for Zombie.advance() method

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    4896f88 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/pickNatchen/PlantsVsZombi… 

    …esCS342TestingProject into NickBranch
    DellUser authored and DellUser committed May 8, 2019
    Configuration menu
    Copy the full SHA
    82032ac View commit details
    Browse the repository at this point in the history

  9. Merge pull request #9 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored May 8, 2019
    Configuration menu
    Copy the full SHA
    978480f View commit details
    Browse the repository at this point in the history

  10. Previously a param was added to the constructor for testing, I added the 

    original constructor back in
    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    c9184a6 View commit details
    Browse the repository at this point in the history

  11. Added comments to the helper methods

    PickNatchen authored and PickNatchen committed May 8, 2019
    Configuration menu
    Copy the full SHA
    b983578 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. Added back the original write() method to include new file

    PickNatchen authored and PickNatchen committed May 10, 2019
    Configuration menu
    Copy the full SHA
    0080e7f View commit details
    Browse the repository at this point in the history

  2. Commenting out other testing data to try to get pull to merge

    PickNatchen authored and PickNatchen committed May 10, 2019
    Configuration menu
    Copy the full SHA
    6b9cd1d View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. Troubleshooting

    PickNatchen authored and PickNatchen committed May 13, 2019
    Configuration menu
    Copy the full SHA
    450f4b5 View commit details
    Browse the repository at this point in the history

  2. Getting back to original state

    PickNatchen authored and PickNatchen committed May 13, 2019
    Configuration menu
    Copy the full SHA
    3c0393f View commit details
    Browse the repository at this point in the history

  3. I have commented out the write() method, as that will have to have 

    testing changes
    PickNatchen authored and PickNatchen committed May 13, 2019
    Configuration menu
    Copy the full SHA
    658e0b2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into NickBranch

    @pickNatchen
    pickNatchen authored May 13, 2019
    Configuration menu
    Copy the full SHA
    f350c18 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #10 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored May 13, 2019
    Configuration menu
    Copy the full SHA
    6ba6894 View commit details
    Browse the repository at this point in the history

  6. Added note

    PickNatchen authored and PickNatchen committed May 13, 2019
    Configuration menu
    Copy the full SHA
    f0339ef View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. Changed the name of a method to better reflect use

    PickNatchen authored and PickNatchen committed May 14, 2019
    Configuration menu
    Copy the full SHA
    f07c23e View commit details
    Browse the repository at this point in the history

  2. Changed Name of method to better reflect use

    PickNatchen authored and PickNatchen committed May 14, 2019
    Configuration menu
    Copy the full SHA
    925513e View commit details
    Browse the repository at this point in the history

  3. Added modified by date

    PickNatchen authored and PickNatchen committed May 14, 2019
    Configuration menu
    Copy the full SHA
    35b16fa View commit details
    Browse the repository at this point in the history

  4. Added date

    PickNatchen authored and DellUser aPickNatchen committed May 14, 2019
    Configuration menu
    Copy the full SHA
    e8da46b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/pickNatchen/PlantsVsZombi… 

    …esCS342TestingProject into NickBranch
    DellUser authored and DellUser committed May 14, 2019
    Configuration menu
    Copy the full SHA
    65baf02 View commit details
    Browse the repository at this point in the history

  6. updated date

    PickNatchen authored and PickNatchen committed May 14, 2019
    Configuration menu
    Copy the full SHA
    fd77a0a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #11 from pickNatchen/NickBranch 

    Nick branch
    @pickNatchen
    pickNatchen authored May 14, 2019
    Configuration menu
    Copy the full SHA
    4d3109f View commit details
    Browse the repository at this point in the history

  8. This class had saved weird last time. Should be g2g

    PickNatchen authored and PickNatchen committed May 14, 2019
    Configuration menu
    Copy the full SHA
    189326a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #12 from pickNatchen/NickBranch 

    This class had saved weird last time. Should be g2g
    @pickNatchen
    pickNatchen authored May 14, 2019
    Configuration menu
    Copy the full SHA
    45d7151 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. Add files via upload

    @gharrington1996
    gharrington1996 authored May 15, 2019
    Configuration menu
    Copy the full SHA
    0bcbbeb View commit details
    Browse the repository at this point in the history