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

MODE-1372 Updated the internal Change events and ChangeSet(s) to contain the primary type and the mixin types of the node involved (4.0) #1004

Closed
wants to merge 6 commits into from

Conversation

hchiorean
Copy link
Member

Also, updated the ModeShape Event API to expose this information as per the JSR-333 spec.

This might cause merge conflicts with #998.

Horia Chiorean added 6 commits January 9, 2014 11:04
…he changeSet instances and which is used as an identifier in the clustered cases instead of the processId, which has a different value each time.
…ain the primary type and the mixin types of the node involved. Also, update the ModeShape Event API to expose this information as per the JSR-333 spec.
@hchiorean
Copy link
Member Author

Rebased on MODE-1683 & fixed conflicts. This should be merged after #998

@rhauch
Copy link
Contributor

rhauch commented Jan 9, 2014

I get this failure every time I run against 'master' (which does include #998):

Failed tests:   shouldReconcileDeltaInCluster(org.modeshape.jcr.journal.ClusteredJournalTest): expected:<2> but was:<0>

junit.framework.AssertionFailedError: expected:&lt;2&gt; but was:&lt;0&gt;
    at junit.framework.Assert.fail(Assert.java:50)
    at junit.framework.Assert.failNotEquals(Assert.java:287)
    at junit.framework.Assert.assertEquals(Assert.java:67)
    at junit.framework.Assert.assertEquals(Assert.java:199)
    at junit.framework.Assert.assertEquals(Assert.java:205)
    at org.modeshape.jcr.journal.ClusteredJournalTest.shouldReconcileDeltaInCluster(ClusteredJournalTest.java:85)

@hchiorean
Copy link
Member Author

that's very weird because all tests pass locally for me. I'll try making the changes to MODE-1683 as we've discussed and then rebase & fix conflicts for this. Hopefully that will prevent the error that you're seeing.

@rhauch
Copy link
Contributor

rhauch commented Jan 10, 2014

The problem appears to be related to the previous PR #998. I know I built locally before merging that, but I'm not sure what happened there. After merging #998, I seem to always get the above error. I've added another commit to 'master' that merely @ignore the problematic test.

So, after doing that, this PR builds cleanly and I rebased and merged into the 'master' branch.

@rhauch rhauch closed this Jan 10, 2014
@hchiorean hchiorean deleted the MODE-1372 branch January 15, 2014 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants