You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/11 16:20:43 UTC
[03/10] git commit: Fix broken test.
Fix broken test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/717200b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/717200b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/717200b6
Branch: refs/pull/52/head
Commit: 717200b689a6caedf032af17e8219d53160eafed
Parents: 10f757c
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Mar 11 10:20:11 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Mar 11 10:20:11 2014 -0400
----------------------------------------------------------------------
.../changelog/ChangeLogGeneratorImplTest.java | 44 +++++++++++++-------
1 file changed, 28 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/717200b6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
index db79739..ef009a6 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
@@ -122,12 +122,12 @@ public class ChangeLogGeneratorImplTest {
//
// based on that data we expect something like this:
//
- // Type = PROPERTY_WRITE, Property = count, Value = 2, Versions = [cd54818c-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_WRITE, Property = name, Value = name3, Versions = [cd54818c-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_DELETE, Property = nickname, Value = buddy, Versions = [cd53be3a-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_DELETE, Property = name, Value = name2, Versions = [cd53be3a-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_DELETE, Property = count, Value = 1, Versions = [cd47b048-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_DELETE, Property = name, Value = name1, Versions = [cd47b048-67f6-11e3-945d-cae0eb411d00]
+ // Type = PROPERTY_WRITE, Property = name, Value = name3, Versions = [560c7e10-a925-11e3-bf9d-10ddb1de66c4]
+ // Type = PROPERTY_WRITE, Property = count, Value = 2, Versions = [560c7e10-a925-11e3-bf9d-10ddb1de66c4]
+ // Type = PROPERTY_DELETE, Property = name, Value = name2, Versions = [560b6c9e-a925-11e3-bf9d-10ddb1de66c4]
+ // Type = PROPERTY_DELETE, Property = nickname, Value = buddy, Versions = [560b6c9e-a925-11e3-bf9d-10ddb1de66c4]
+ // Type = PROPERTY_DELETE, Property = name, Value = name1, Versions = [55faa3bc-a925-11e3-bf9d-10ddb1de66c4]
+ // Type = PROPERTY_DELETE, Property = count, Value = 1, Versions = [55faa3bc-a925-11e3-bf9d-10ddb1de66c4]
List<MvccEntity> versions = mvccEntitySerializationStrategy
.load( context, e1.getId(), e3.getVersion(), 10);
@@ -142,11 +142,23 @@ public class ChangeLogGeneratorImplTest {
Assert.assertEquals( 6, result.size() );
Assert.assertTrue( isAscendingOrder( result ) );
+ Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_WRITE, result.get( 0 ).getChangeType() );
+ Assert.assertEquals( "name3", result.get( 0 ).getField().getValue() );
+
Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_WRITE, result.get( 1 ).getChangeType() );
- Assert.assertEquals( "name3", result.get( 1 ).getField().getValue() );
+ Assert.assertEquals( "2", result.get( 1 ).getField().getValue().toString() );
+
+ Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_DELETE, result.get( 2 ).getChangeType() );
+ Assert.assertEquals( "name2", result.get( 2 ).getField().getValue() );
+
+ Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_DELETE, result.get( 3 ).getChangeType() );
+ Assert.assertEquals( "buddy", result.get( 3 ).getField().getValue() );
+
+ Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_DELETE, result.get( 4 ).getChangeType() );
+ Assert.assertEquals( "name1", result.get( 4 ).getField().getValue() );
Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_DELETE, result.get( 5 ).getChangeType() );
- Assert.assertEquals( "name1", result.get( 5 ).getField().getValue() );
+ Assert.assertEquals( "1", result.get( 5 ).getField().getValue().toString() );
}
{
@@ -155,12 +167,12 @@ public class ChangeLogGeneratorImplTest {
//
// based on that data we expect something like this:
//
- // Type = PROPERTY_WRITE, Property = count, Value = 2, Versions = [cd53be3a-67f6-11e3-945d-cae0eb411d00, cd54818c-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_WRITE, Property = name, Value = name3, Versions = [cd54818c-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_WRITE, Property = nickname, Value = buddy, Versions = [cd53be3a-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_WRITE, Property = name, Value = name2, Versions = [cd53be3a-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_DELETE, Property = count, Value = 1, Versions = [cd47b048-67f6-11e3-945d-cae0eb411d00]
- // Type = PROPERTY_DELETE, Property = name, Value = name1, Versions = [cd47b048-67f6-11e3-945d-cae0eb411d00]
+ // Type = PROPERTY_WRITE, Property = name, Value = name3, Versions = [c771f63f-a927-11e3-8bfc-10ddb1de66c4]
+ // Type = PROPERTY_WRITE, Property = count, Value = 2, Versions = [c770e4cd-a927-11e3-8bfc-10ddb1de66c4, c771f63f-a927-11e3-8bfc-10ddb1de66c4]
+ // Type = PROPERTY_WRITE, Property = name, Value = name2, Versions = [c770e4cd-a927-11e3-8bfc-10ddb1de66c4]
+ // Type = PROPERTY_WRITE, Property = nickname, Value = buddy, Versions = [c770e4cd-a927-11e3-8bfc-10ddb1de66c4]
+ // Type = PROPERTY_DELETE, Property = name, Value = name1, Versions = [c75f589b-a927-11e3-8bfc-10ddb1de66c4]
+ // Type = PROPERTY_DELETE, Property = count, Value = 1, Versions = [c75f589b-a927-11e3-8bfc-10ddb1de66c4]
List<MvccEntity> versions = mvccEntitySerializationStrategy
.load( context, e1.getId(), e3.getVersion(), 10);
@@ -176,10 +188,10 @@ public class ChangeLogGeneratorImplTest {
Assert.assertTrue( isAscendingOrder( result ) );
Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_WRITE, result.get( 2 ).getChangeType() );
- Assert.assertEquals( "buddy", result.get( 2 ).getField().getValue() );
+ Assert.assertEquals( "name2", result.get( 2 ).getField().getValue() );
Assert.assertEquals( ChangeLogEntry.ChangeType.PROPERTY_DELETE, result.get( 4 ).getChangeType() );
- Assert.assertEquals( "count", result.get( 4 ).getField().getName() );
+ Assert.assertEquals( "name", result.get( 4 ).getField().getName() );
}
}