You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2017/03/14 08:50:17 UTC
svn commit: r1786854 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
Author: reschke
Date: Tue Mar 14 08:50:17 2017
New Revision: 1786854
URL: http://svn.apache.org/viewvc?rev=1786854&view=rev
Log:
OAK-4802: Basic cache consistency test on exception (ported to 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
- copied, changed from r1760677, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 14 08:50:17 2017
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.4:1745750,1747354,1750078,1750512
-/jackrabbit/oak/trunk:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376
,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693
401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1
705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707223,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716840,1716845,1716883,1717177,1717203,1717277,1717393-1717394,1717410,1717462,171763
2,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718546-1718548,1718553,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727149,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728294-1728297,1728300,1728443,1728525,1728642,1729200,1729505,1729578,1729599,1729957,1729962,1729979,1730050,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732268,173
2278,1732330,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735919,1736176,1737309-1737310,1737334,1737349,1738138,1738252,1738833,1738950,1738957,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742117,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1746117,1746408,1746696,1746981,1747341-1747342,1747380,1747387,1747406,1747492,1747654,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886,1751376,1751410,1751445-1751446,1751478,1751755,1752198,1752202,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755366,1756520,
1756580,1757119,1757166,1759433,1760340,1760373,1760387,1761444,1761571,1761762,1761787,1763347,1763378,1763735,1764705,1765817,1765983,1766071,1766496,1766554,1766644,1767025,1767265,1768446,1768637,1770694,1771739,1775474,1775622,1775757,1780543,1781068,1781075,1781386,1781846,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784401,1784574,1785283
+/jackrabbit/oak/trunk:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376
,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693
401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1
705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707223,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716840,1716845,1716883,1717177,1717203,1717277,1717393-1717394,1717410,1717462,171763
2,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718546-1718548,1718553,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720306,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725895,1725899,1725935,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727149,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,1728037,1728041,1728070,1728114,1728281,1728294-1728297,1728300,1728443,1728525,1728642,1729200,1729505,1729578,1729599,1729957,1729962,1729979,1730050,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732268,173
2278,1732330,1732647-1732648,1732864,1733615,1733929,1734230,1734254,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735919,1736176,1737309-1737310,1737334,1737349,1738138,1738252,1738833,1738950,1738957,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742117,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1746117,1746408,1746696,1746981,1747341-1747342,1747380,1747387,1747406,1747492,1747654,1748505,1748553,1748722,1748870,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886,1751376,1751410,1751445-1751446,1751478,1751755,1752198,1752202,1752273-1752274,1752438,1752508,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755366,1756520,
1756580,1757119,1757166,1759433,1760340,1760373,1760387,1760677,1760701,1761444,1761571,1761762,1761787,1763347,1763378,1763735,1764705,1765817,1765983,1766071,1766496,1766554,1766644,1767025,1767265,1768446,1768637,1770694,1771739,1775474,1775622,1775757,1780543,1781068,1781075,1781386,1781846,1782476,1783066,1783089,1783104-1783105,1783619,1783855,1784023,1784130,1784251,1784401,1784574,1785283
/jackrabbit/trunk:1345480
Copied: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java (from r1760677, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java&r1=1760677&r2=1786854&rev=1786854&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java Tue Mar 14 08:50:17 2017
@@ -21,6 +21,8 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
+import com.google.common.collect.Lists;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -57,33 +59,47 @@ public abstract class CacheConsistencyTe
@Test
public void testExceptionInvalidatesCache() {
- String id = this.getClass().getName() + ".testExceptionInvalidatesCache";
- UpdateOp up = new UpdateOp(id, true);
- up.set("_id", id);
- up.set("_test", "oldvalue");
- ds.create(Collection.NODES, Collections.singletonList(up));
- removeMe.add(id);
+ String id1 = this.getClass().getName() + ".testExceptionInvalidatesCache1";
+ UpdateOp up1 = new UpdateOp(id1, true);
+ up1.set("_id", id1);
+ up1.set("_test", "oldvalue");
+ String id2 = this.getClass().getName() + ".testExceptionInvalidatesCache2";
+ UpdateOp up2 = new UpdateOp(id2, true);
+ up2.set("_id", id2);
+ up2.set("_test", "oldvalue");
+ String id3 = this.getClass().getName() + ".testExceptionInvalidatesCache3";
+ UpdateOp up3 = new UpdateOp(id3, true);
+ up3.set("_id", id3);
+ up3.set("_test", "oldvalue");
+ ds.create(Collection.NODES, Lists.newArrayList(up1, up2, up3));
+ removeMe.add(id1);
+ removeMe.add(id2);
+ removeMe.add(id3);
// make sure cache is populated
- NodeDocument olddoc = ds.find(Collection.NODES, id, 1000);
+ NodeDocument olddoc = ds.find(Collection.NODES, id1, 1000);
+ assertEquals("oldvalue", olddoc.get("_test"));
+ olddoc = ds.find(Collection.NODES, id2, 1000);
+ assertEquals("oldvalue", olddoc.get("_test"));
+ olddoc = ds.find(Collection.NODES, id3, 1000);
assertEquals("oldvalue", olddoc.get("_test"));
// findAndUpdate
try {
// make sure cache is populated
- olddoc = ds.find(Collection.NODES, id);
+ olddoc = ds.find(Collection.NODES, id1);
String random = UUID.randomUUID().toString();
setTemporaryUpdateException(random);
try {
- up = new UpdateOp(id, false);
- up.set("_id", id);
- up.set("_test", random);
- ds.findAndUpdate(Collection.NODES, up);
+ up1 = new UpdateOp(id1, false);
+ up1.set("_id", id1);
+ up1.set("_test", random);
+ ds.findAndUpdate(Collection.NODES, up1);
fail("should have failed with DocumentStoreException");
} catch (DocumentStoreException ex) {
assertEquals("should fail with enforced exception", ex.getCause().getMessage(), random);
// make sure cache was invalidated
- NodeDocument newdoc = ds.find(Collection.NODES, id, 1000);
+ NodeDocument newdoc = ds.find(Collection.NODES, id1, 1000);
assertNotNull(newdoc);
assertEquals(random, newdoc.get("_test"));
}
@@ -94,20 +110,20 @@ public abstract class CacheConsistencyTe
// update
try {
// make sure cache is populated
- olddoc = ds.find(Collection.NODES, id);
+ olddoc = ds.find(Collection.NODES, id1);
String random = UUID.randomUUID().toString();
setTemporaryUpdateException(random);
try {
- up = new UpdateOp(id, false);
- up.set("_id", id);
- up.set("_test", random);
- ds.update(Collection.NODES, Collections.singletonList(id), up);
+ up1 = new UpdateOp(id1, false);
+ up1.set("_id", id1);
+ up1.set("_test", random);
+ ds.update(Collection.NODES, Collections.singletonList(id1), up1);
fail("should have failed with DocumentStoreException");
} catch (DocumentStoreException ex) {
assertEquals("should fail with enforced exception", ex.getCause().getMessage(), random);
// make sure cache was invalidated
- NodeDocument newdoc = ds.find(Collection.NODES, id, 1000);
+ NodeDocument newdoc = ds.find(Collection.NODES, id1, 1000);
assertNotNull(newdoc);
assertEquals(random, newdoc.get("_test"));
}
@@ -118,20 +134,62 @@ public abstract class CacheConsistencyTe
// createOrUpdate
try {
// make sure cache is populated
- olddoc = ds.find(Collection.NODES, id);
+ olddoc = ds.find(Collection.NODES, id1);
String random = UUID.randomUUID().toString();
setTemporaryUpdateException(random);
try {
- up = new UpdateOp(id, false);
- up.set("_id", id);
- up.set("_test", random);
- ds.createOrUpdate(Collection.NODES, up);
+ up1 = new UpdateOp(id1, false);
+ up1.set("_id", id1);
+ up1.set("_test", random);
+ ds.createOrUpdate(Collection.NODES, up1);
fail("should have failed with DocumentStoreException");
} catch (DocumentStoreException ex) {
assertEquals("should fail with enforced exception", ex.getCause().getMessage(), random);
// make sure cache was invalidated
- NodeDocument newdoc = ds.find(Collection.NODES, id, 1000);
+ NodeDocument newdoc = ds.find(Collection.NODES, id1, 1000);
+ assertNotNull(newdoc);
+ assertEquals(random, newdoc.get("_test"));
+ }
+ } finally {
+ setTemporaryUpdateException(null);
+ }
+
+ // createOrUpdate multiple
+ try {
+ // make sure cache is populated
+ olddoc = ds.find(Collection.NODES, id1);
+ assertNotNull(olddoc);
+ olddoc = ds.find(Collection.NODES, id2);
+ assertNotNull(olddoc);
+ olddoc = ds.find(Collection.NODES, id3);
+ assertNotNull(olddoc);
+
+ String random = UUID.randomUUID().toString();
+ setTemporaryUpdateException(random);
+ try {
+ up1 = new UpdateOp(id1, false);
+ up1.set("_id", id1);
+ up1.set("_test", random);
+ up2 = new UpdateOp(id2, false);
+ up2.set("_id", id2);
+ up2.set("_test", random);
+ up3 = new UpdateOp(id3, false);
+ up3.set("_id", id3);
+ up3.set("_test", random);
+
+ ds.createOrUpdate(Collection.NODES, Lists.newArrayList(up1, up2, up3));
+ fail("should have failed with DocumentStoreException");
+ } catch (DocumentStoreException ex) {
+ assertEquals("should fail with enforced exception", ex.getCause().getMessage(), random);
+ // make sure cache was invalidated
+ NodeDocument newdoc = ds.find(Collection.NODES, id1, 1000);
+ assertNotNull(newdoc);
+ assertEquals(random, newdoc.get("_test"));
+ newdoc = ds.find(Collection.NODES, id2, 1000);
+ assertNotNull(newdoc);
+ assertEquals(random, newdoc.get("_test"));
+ newdoc = ds.find(Collection.NODES, id3, 1000);
assertNotNull(newdoc);
assertEquals(random, newdoc.get("_test"));
}
@@ -144,12 +202,12 @@ public abstract class CacheConsistencyTe
String random = UUID.randomUUID().toString();
setTemporaryUpdateException(random);
try {
- ds.remove(Collection.NODES, id);
+ ds.remove(Collection.NODES, id1);
fail("should have failed with DocumentStoreException");
} catch (DocumentStoreException ex) {
assertEquals("should fail with enforced exception", ex.getCause().getMessage(), random);
// make sure cache was invalidated
- NodeDocument newdoc = ds.find(Collection.NODES, id, 1000);
+ NodeDocument newdoc = ds.find(Collection.NODES, id1, 1000);
assertNull(newdoc);
}
} finally {