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.

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

ReplaySubject - Manual Merge of Pull 218 #241

Merged

Conversation

benjchristensen
Copy link
Member

Manual merge of ReplaySubject from pull request #218

  • merged DefaultSubject and PublishedSubject which were the same thing (lots more unit tests though from this pull request)
  • still not sure what the right name is for DefaultSubject/PublishSubject
  • renamed RepeatSubject to ReplaySubject to match .Net
  • tweaked unit tests with InOrder while reviewing them to understand behavior
  • moved UnsubscribeTester into a package private class as I'm still undecided on long-term placement of this and the OperatorTester class

@benjchristensen
Copy link
Member Author

I have some open questions but want to get this merged so we can unblock progress in this area of subjects.

benjchristensen added a commit that referenced this pull request Apr 18, 2013
ReplaySubject - Manual Merge of Pull 218
@benjchristensen benjchristensen merged commit 6bff9aa into ReactiveX:master Apr 18, 2013
@benjchristensen benjchristensen deleted the pull-218-merge-replay branch April 18, 2013 20:21
…-218-merge-replay

Conflicts:
	rxjava-core/src/main/java/rx/operators/OperationTake.java
	rxjava-core/src/main/java/rx/operators/OperationTakeWhile.java
	rxjava-core/src/main/java/rx/subjects/Subject.java

- moved UnsubscribeTester into a package private class as I'm still undecided on long-term placement of this and the OperatorTester class
- merged DefaultSubject and PublishedSubject which were the same thing (lots more unit tests though from this pull request)
- still not sure what the right name is for DefaultSubject/PublishSubject
- renamed RepeatSubject to ReplaySubject to match .Net
- tweaked unit tests with InOrder while reviewing them to understand behavior
@cloudbees-pull-request-builder

RxJava-pull-requests #102 SUCCESS
This pull request looks good

rickbw pushed a commit to rickbw/RxJava that referenced this pull request Jan 9, 2014
…replay

ReplaySubject - Manual Merge of Pull 218
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants