New Exceptions for CommManager added
New Exceptions for CommManager added
New Exceptions for CommManager added, RouterException must be caught in Test class
Unused import removed.
Handling for InvalidProtocolBufferException added.
Beta version of the tests. Dealer test has few bugs. Need to test for starvation and responding in correct order.
Final beta of the CommManager tests. Liveness tests can fail, not a big teal the way they're currently set up. Other test must not fail if the code is to work correctly.
Eclipse added file when Tests were tested in Eclipse.
Tests were originally written and executed in NetBeans
Final beta addition: Edited test comments for clarity
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 5 commits.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   .idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
#	new file:   .idea/libraries/Maven__org_zeromq_jeromq_0_3_1.xml
#	new file:   .settings/org.eclipse.jdt.core.prefs
#	new file:   .settings/org.eclipse.m2e.core.prefs
#	new file:   CommManager.iml
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   CommManager.iml
#	modified:   src/Test.java
#	modified:   src/com/wispear/comm/CommManager.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/.name
#	.idea/compiler.xml
#	.idea/copyright/
#	.idea/encodings.xml
#	.idea/misc.xml
#	.idea/modules.xml
#	.idea/scopes/
#	.idea/uiDesigner.xml
#	.idea/vcs.xml
#	.idea/workspace.xml
Merge branch 'Tests' of https://github.com/mmaracic/CommManager into mmaracic-Tests

Conflicts:
	src/Test.java
	src/com/wispear/comm/CommManager.java
Modified the unit tests slightly after reviewing them.
Merge branch 'mmaracic-Tests'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	CommManager.iml
Refactoring Maracic's additions.
Maracic changes