Unit & Functional Testing #777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s wrong credentials
…ndencies. BlogTest is incomplete as of this commit; just want to get something into the repo for review to make sure I’m doing it right.
Started unit testing Blog. Refactored Blog to remove persistence dependencies.
…ordPress-Android into feature/japan-testing
…ordPress-Android into feature/japan-testing
Fixed a couple NPEs possible with current Blog implementation.
…ed via an abstract factory
fix oauth mock add sInstances to customizable mock in order to track all instantiated clients add a test to check for login error
…ordPress-Android into feature/japan-testing
Conflicts: src/org/wordpress/android/ui/accounts/CreateUserAndBlog.java
Conflicts: src/org/wordpress/android/ui/accounts/NewAccountAbstractPageFragment.java src/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
Conflicts: src/org/wordpress/android/ui/stats/StatsActivity.java
Conflicts: src/org/wordpress/android/WordPress.java src/org/wordpress/android/ui/stats/WPComLoginActivity.java src/org/xmlrpc/android/ApiHelper.java
Conflicts: src/org/wordpress/android/WordPressDB.java src/org/wordpress/android/ui/comments/EditCommentActivity.java src/org/wordpress/android/ui/notifications/NotificationsActivity.java src/org/xmlrpc/android/ApiHelper.java src/org/xmlrpc/android/XMLRPCClient.java
| import org.wordpress.android.util.AppLog.T; | ||
|
|
||
| public class RestClientFactory { | ||
| public static RestClientFactoryAbstract sFactory; |
There was a problem hiding this comment.
sFactory is used in the test package to override the default factory. It could be a good idea to make it private cause we don't want to change it in production and even add a check in the setter to be sure we're in test mode.
Conflicts: src/org/wordpress/android/util/PostUploadService.java
|
The last merge (develop into feature/japan-testing) went smoothly, so I'm merging it to develop. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch adds: