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 mr...@apache.org on 2015/10/28 17:56:35 UTC
svn commit: r1711053 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugi...
Author: mreutegg
Date: Wed Oct 28 16:56:34 2015
New Revision: 1711053
URL: http://svn.apache.org/viewvc?rev=1711053&view=rev
Log:
OAK-3562: Tests do not close MongoConnection
Merged revision 1710972 from trunk
Added:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java
- copied unchanged from r1710972, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudGetLengthTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudReadTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudWriteTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/MongoCloudBlobGCTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 28 16:56:34 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.2:1695500,1700753,1709440
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609
064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1
627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633327,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,164135
0,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646687,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,165
6033,1656303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,
1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,16850
23,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,17
01750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1702014,1702045,1702241,1702272,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1706764,1706772,1707049,1707191,1707435,1708105,1708546,1708592,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710811,1710816
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609
064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1
627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633327,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,164135
0,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646687,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,165
6033,1656303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,
1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,16850
23,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,17
01750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1702014,1702045,1702241,1702272,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1706764,1706772,1707049,1707191,1707435,1708105,1708546,1708592,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710811,1710816,1710972
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java Wed Oct 28 16:56:34 2015
@@ -68,6 +68,7 @@ public abstract class AbstractDocumentSt
LOG.info(removeMe.size() + " documents removed in " + elapsed + "ms (" + rate + "/ms)");
}
}
+ ds.dispose();
dsf.dispose();
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java Wed Oct 28 16:56:34 2015
@@ -25,6 +25,7 @@ import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
/**
* Base class for test cases that need a {@link MongoConnection}
@@ -33,17 +34,20 @@ import org.junit.BeforeClass;
*/
public abstract class AbstractMongoConnectionTest extends DocumentMKTestBase {
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
+
protected MongoConnection mongoConnection;
protected DocumentMK mk;
@BeforeClass
public static void checkMongoDbAvailable() {
- Assume.assumeNotNull(MongoUtils.getConnection());
+ Assume.assumeTrue(MongoUtils.isAvailable());
}
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
Revision.setClock(getTestClock());
mk = newBuilder(mongoConnection.getDB()).open();
@@ -60,11 +64,7 @@ public abstract class AbstractMongoConne
@After
public void tearDownConnection() throws Exception {
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
Revision.resetClockToDefault();
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java Wed Oct 28 16:56:34 2015
@@ -30,6 +30,12 @@ public abstract class AbstractMultiDocum
this.ds2 = dsf.createDocumentStore(2);
}
+ @Override
+ public void cleanUp() throws Exception {
+ super.cleanUp();
+ ds2.dispose();
+ }
+
@Parameterized.Parameters
public static Collection<Object[]> fixtures() {
return fixtures(true);
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobTest.java Wed Oct 28 16:56:34 2015
@@ -43,6 +43,9 @@ public class BlobTest {
@Rule
public DocumentMKBuilderProvider builderProvider = new DocumentMKBuilderProvider();
+
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
private static final Logger LOG = LoggerFactory.getLogger(RandomizedClusterTest.class);
@@ -55,12 +58,12 @@ public class BlobTest {
private static final int DOCUMENT_COUNT = 10;
DB openMongoConnection() {
- return MONGO_DB ? MongoUtils.getConnection().getDB() : null;
+ return MONGO_DB ? connectionFactory.getConnection().getDB() : null;
}
void dropCollections() {
if (MONGO_DB) {
- MongoUtils.dropCollections(MongoUtils.getConnection().getDB());
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java Wed Oct 28 16:56:34 2015
@@ -46,7 +46,7 @@ public class CacheConsistencyTest extend
@Before
@Override
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
DB db = mongoConnection.getDB();
MongoUtils.dropCollections(db);
DocumentMK.Builder builder = new DocumentMK.Builder()
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java Wed Oct 28 16:56:34 2015
@@ -36,7 +36,7 @@ public class ClusterJoinTest extends Abs
// start a new DocumentMK instance. this instance sees /foo
// because it started after the commit on the first DocumentMK
DocumentMK mk2 = new DocumentMK.Builder().setAsyncDelay(0)
- .setMongoDB(MongoUtils.getConnection().getDB()).open();
+ .setMongoDB(connectionFactory.getConnection().getDB()).open();
try {
// this creates a first commit from the second DocumentMK instance
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java Wed Oct 28 16:56:34 2015
@@ -54,6 +54,7 @@ import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
/**
@@ -61,6 +62,9 @@ import org.junit.Test;
*/
public class ClusterTest {
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
+
private static final boolean MONGO_DB = false;
// private static final boolean MONGO_DB = true;
@@ -404,7 +408,7 @@ public class ClusterTest {
}
mks.clear();
if (MONGO_DB) {
- DB db = MongoUtils.getConnection().getDB();
+ DB db = connectionFactory.getConnection().getDB();
MongoUtils.dropCollections(db);
}
}
@@ -420,7 +424,7 @@ public class ClusterTest {
private DocumentMK createMK(int clusterId, int asyncDelay) {
if (MONGO_DB) {
- DB db = MongoUtils.getConnection().getDB();
+ DB db = connectionFactory.getConnection().getDB();
return register(new DocumentMK.Builder().setMongoDB(db)
.setClusterId(clusterId).setAsyncDelay(asyncDelay).open());
} else {
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java Wed Oct 28 16:56:34 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.List;
+
import javax.sql.DataSource;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
@@ -27,6 +29,7 @@ import org.apache.jackrabbit.oak.plugins
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
@@ -156,23 +159,12 @@ public abstract class DocumentStoreFixtu
public DataSource getRDBDataSource() {
return dataSource;
}
-
- @Override
- public void dispose() {
- if (this.store1 != null) {
- this.store1.dispose();
- this.store1 = null;
- }
- if (this.store2 != null) {
- this.store2.dispose();
- this.store2 = null;
- }
- }
}
public static class MongoFixture extends DocumentStoreFixture {
public static final String DEFAULT_URI = "mongodb://localhost:27017/oak-test";
private String uri;
+ private List<MongoConnection> connections = Lists.newArrayList();
public MongoFixture() {
this(DEFAULT_URI);
@@ -191,6 +183,7 @@ public abstract class DocumentStoreFixtu
public DocumentStore createDocumentStore(int clusterId) {
try {
MongoConnection connection = new MongoConnection(uri);
+ connections.add(connection);
DB db = connection.getDB();
MongoUtils.dropCollections(db);
return new MongoDocumentStore(db, new DocumentMK.Builder().setClusterId(clusterId));
@@ -203,7 +196,11 @@ public abstract class DocumentStoreFixtu
public boolean isAvailable() {
try {
MongoConnection connection = new MongoConnection(uri);
- connection.getDB().command(new BasicDBObject("ping", 1));
+ try {
+ connection.getDB().command(new BasicDBObject("ping", 1));
+ } finally {
+ connection.close();
+ }
return true;
} catch (Exception e) {
return false;
@@ -214,9 +211,17 @@ public abstract class DocumentStoreFixtu
public void dispose() {
try {
MongoConnection connection = new MongoConnection(uri);
- connection.getDB().dropDatabase();
+ try {
+ connection.getDB().dropDatabase();
+ } finally {
+ connection.close();
+ }
} catch (Exception ignore) {
}
+ for (MongoConnection c : connections) {
+ c.close();
+ }
+ connections.clear();
}
}
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java Wed Oct 28 16:56:34 2015
@@ -35,6 +35,7 @@ import org.apache.jackrabbit.oak.plugins
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,6 +52,9 @@ public class MongoDocumentStoreTest {
private static final Logger LOG = LoggerFactory.getLogger(MongoDocumentStoreTest.class);
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
+
// private static final boolean MONGO_DB = true;
// private static final int NODE_COUNT = 2000;
@@ -59,14 +63,14 @@ public class MongoDocumentStoreTest {
DocumentStore openDocumentStore() {
if (MONGO_DB) {
- return new MongoDocumentStore(MongoUtils.getConnection().getDB(), new DocumentMK.Builder());
+ return new MongoDocumentStore(connectionFactory.getConnection().getDB(), new DocumentMK.Builder());
}
return new MemoryDocumentStore();
}
void dropCollections() {
if (MONGO_DB) {
- MongoUtils.dropCollections(MongoUtils.getConnection().getDB());
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
@@ -246,7 +250,7 @@ public class MongoDocumentStoreTest {
private void doInsert(int n, boolean batch) throws Exception {
dropCollections();
- DBCollection collection = MongoUtils.getConnection().getDB().getCollection("batchInsertTest");
+ DBCollection collection = connectionFactory.getConnection().getDB().getCollection("batchInsertTest");
DBObject index = new BasicDBObject();
index.put("_path", 1L);
DBObject options = new BasicDBObject();
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java Wed Oct 28 16:56:34 2015
@@ -82,4 +82,18 @@ public class MongoUtils {
}
}
+ /**
+ * @return true if MongoDB is available, false otherwise.
+ */
+ public static boolean isAvailable() {
+ MongoConnection c = getConnection();
+ try {
+ return c != null;
+ } finally {
+ if (c != null) {
+ c.close();
+ }
+ }
+ }
+
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java Wed Oct 28 16:56:34 2015
@@ -33,6 +33,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.junit.Rule;
import org.junit.Test;
import com.mongodb.DB;
@@ -47,6 +48,9 @@ public class RandomizedClusterTest {
private static final int MK_COUNT = 2;
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
+
private MemoryDocumentStore ds;
private MemoryBlobStore bs;
@@ -374,7 +378,7 @@ public class RandomizedClusterTest {
DocumentMK.Builder builder = new DocumentMK.Builder();
builder.setAsyncDelay(0);
if (MONGO_DB) {
- DB db = MongoUtils.getConnection().getDB();
+ DB db = connectionFactory.getConnection().getDB();
MongoUtils.dropCollections(db);
builder.setMongoDB(db);
} else {
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java Wed Oct 28 16:56:34 2015
@@ -44,7 +44,10 @@ public class SimpleTest {
@Rule
public DocumentMKBuilderProvider builderProvider = new DocumentMKBuilderProvider();
-
+
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
+
private static final boolean MONGO_DB = false;
// private static final boolean MONGO_DB = true;
@@ -435,7 +438,7 @@ public class SimpleTest {
DocumentMK.Builder builder = builderProvider.newBuilder();
if (MONGO_DB) {
- DB db = MongoUtils.getConnection().getDB();
+ DB db = connectionFactory.getConnection().getDB();
MongoUtils.dropCollections(db);
builder.setMongoDB(db);
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java Wed Oct 28 16:56:34 2015
@@ -34,7 +34,7 @@ public class MongoBlobStoreTest extends
@BeforeClass
public static void checkMongoDbAvailable() {
- Assume.assumeNotNull(MongoUtils.getConnection());
+ Assume.assumeTrue(MongoUtils.isAvailable());
}
@Before
@@ -53,6 +53,7 @@ public class MongoBlobStoreTest extends
@Override
public void tearDown() throws Exception {
MongoUtils.dropCollections(mongoConnection.getDB());
+ mongoConnection.close();
super.tearDown();
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudGetLengthTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudGetLengthTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudGetLengthTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudGetLengthTest.java Wed Oct 28 16:56:34 2015
@@ -41,7 +41,7 @@ public class DocumentMKCloudGetLengthTes
@Override
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(CloudStoreUtils.getBlobStore()).open();
@@ -52,10 +52,6 @@ public class DocumentMKCloudGetLengthTes
public void tearDownConnection() throws Exception {
((CloudBlobStore) mk.getNodeStore().getBlobStore()).deleteBucket();
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudReadTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudReadTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudReadTest.java Wed Oct 28 16:56:34 2015
@@ -42,7 +42,7 @@ public class DocumentMKCloudReadTest ext
@Override
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(CloudStoreUtils.getBlobStore()).open();
@@ -53,10 +53,6 @@ public class DocumentMKCloudReadTest ext
public void tearDownConnection() throws Exception {
((CloudBlobStore) mk.getNodeStore().getBlobStore()).deleteBucket();
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudWriteTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudWriteTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/DocumentMKCloudWriteTest.java Wed Oct 28 16:56:34 2015
@@ -42,7 +42,7 @@ public class DocumentMKCloudWriteTest ex
@Override
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(CloudStoreUtils.getBlobStore()).open();
@@ -53,10 +53,6 @@ public class DocumentMKCloudWriteTest ex
public void tearDownConnection() throws Exception {
((CloudBlobStore) mk.getNodeStore().getBlobStore()).deleteBucket();
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/MongoCloudBlobGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/MongoCloudBlobGCTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/MongoCloudBlobGCTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/cloud/MongoCloudBlobGCTest.java Wed Oct 28 16:56:34 2015
@@ -42,7 +42,7 @@ public class MongoCloudBlobGCTest extend
@Before
@Override
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(CloudStoreUtils.getBlobStore()).open();
@@ -53,10 +53,6 @@ public class MongoCloudBlobGCTest extend
public void tearDownConnection() throws Exception {
((CloudBlobStore) mk.getNodeStore().getBlobStore()).deleteBucket();
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java Wed Oct 28 16:56:34 2015
@@ -43,7 +43,7 @@ public class DocumentMKDataStoreGetLengt
@Override
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(DataStoreUtils.getBlobStore()).open();
@@ -54,10 +54,6 @@ public class DocumentMKDataStoreGetLengt
public void tearDownConnection() throws Exception {
FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java Wed Oct 28 16:56:34 2015
@@ -44,7 +44,7 @@ public class DocumentMKDataStoreReadTest
@Override
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(DataStoreUtils.getBlobStore()).open();
@@ -55,10 +55,6 @@ public class DocumentMKDataStoreReadTest
public void tearDownConnection() throws Exception {
FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java Wed Oct 28 16:56:34 2015
@@ -44,7 +44,7 @@ public class DocumentMKDataStoreWriteTes
@Override
@Before
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().setMongoDB(mongoConnection.getDB())
.setBlobStore(DataStoreUtils.getBlobStore()).open();
@@ -55,10 +55,6 @@ public class DocumentMKDataStoreWriteTes
public void tearDownConnection() throws Exception {
FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java Wed Oct 28 16:56:34 2015
@@ -45,7 +45,7 @@ public class MongoDataStoreBlobGCTest ex
@Before
@Override
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
mk = new DocumentMK.Builder().clock(getTestClock()).setMongoDB(mongoConnection.getDB())
.setBlobStore(DataStoreUtils.getBlobStore()).open();
@@ -56,10 +56,6 @@ public class MongoDataStoreBlobGCTest ex
public void tearDownConnection() throws Exception {
FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
mk.dispose();
- // the db might already be closed
- mongoConnection.close();
- mongoConnection = MongoUtils.getConnection();
- MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
+ MongoUtils.dropCollections(connectionFactory.getConnection().getDB());
}
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java Wed Oct 28 16:56:34 2015
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
-import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.junit.After;
import org.junit.Test;
@@ -45,7 +44,7 @@ public class DocumentMKConcurrentAddTest
private List<DocumentMK> mks = new ArrayList<DocumentMK>();
private DocumentMK createMicroKernel() throws Exception {
- MongoConnection connection = MongoUtils.getConnection();
+ MongoConnection connection = connectionFactory.getConnection();
DB mongoDB = connection.getDB();
return new DocumentMK.Builder().memoryCacheSize(CACHE_SIZE).setMongoDB(mongoDB).open();
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java Wed Oct 28 16:56:34 2015
@@ -49,7 +49,7 @@ public class CacheConsistencyIT extends
@Before
@Override
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
DB db = mongoConnection.getDB();
MongoUtils.dropCollections(db);
DocumentMK.Builder builder = new DocumentMK.Builder()
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java Wed Oct 28 16:56:34 2015
@@ -27,7 +27,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -257,8 +256,8 @@ public class CacheInvalidationIT extends
}
}
- private static DocumentNodeStore createNS(int clusterId) throws Exception {
- MongoConnection mc = MongoUtils.getConnection();
+ private DocumentNodeStore createNS(int clusterId) throws Exception {
+ MongoConnection mc = connectionFactory.getConnection();
return new DocumentMK.Builder()
.setMongoDB(mc.getDB())
.setClusterId(clusterId)
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java Wed Oct 28 16:56:34 2015
@@ -25,7 +25,6 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -44,7 +43,7 @@ public class ClusterConflictTest extends
@Override
public void setUpConnection() throws Exception {
super.setUpConnection();
- ns2 = newBuilder(MongoUtils.getConnection().getDB()).getNodeStore();
+ ns2 = newBuilder(connectionFactory.getConnection().getDB()).getNodeStore();
}
@Override
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java Wed Oct 28 16:56:34 2015
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import org.apache.jackrabbit.oak.plugins.document.JournalGarbageCollector;
+import org.apache.jackrabbit.oak.plugins.document.MongoConnectionFactory;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
@@ -37,6 +38,7 @@ import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,17 +49,19 @@ public class JournalIT extends AbstractJ
private static final Logger LOG = LoggerFactory.getLogger(JournalIT.class);
+ @Rule
+ public MongoConnectionFactory connectionFactory = new MongoConnectionFactory();
+
@BeforeClass
public static void checkMongoDbAvailable() {
- Assume.assumeNotNull(MongoUtils.getConnection());
+ Assume.assumeTrue(MongoUtils.isAvailable());
}
@Before
@After
public void dropCollections() throws Exception {
- MongoConnection mongoConnection = MongoUtils.getConnection();
+ MongoConnection mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
- mongoConnection.close();
}
@Test
@@ -213,7 +217,7 @@ public class JournalIT extends AbstractJ
}
protected DocumentMK createMK(int clusterId, int asyncDelay) {
- DB db = MongoUtils.getConnection().getDB();
+ DB db = connectionFactory.getConnection().getDB();
builder = newDocumentMKBuilder();
return register(builder.setMongoDB(db)
.setClusterId(clusterId).setAsyncDelay(asyncDelay).open());
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreTest.java Wed Oct 28 16:56:34 2015
@@ -44,7 +44,7 @@ public class MongoDocumentStoreTest exte
@Override
public void setUpConnection() throws Exception {
- mongoConnection = MongoUtils.getConnection();
+ mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
DocumentMK.Builder builder = new DocumentMK.Builder();
store = new TestStore(mongoConnection.getDB(), builder);
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/QueryHintTest.java Wed Oct 28 16:56:34 2015
@@ -27,23 +27,21 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import com.google.common.collect.Lists;
+
+import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
-import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
-import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
-import org.junit.Assume;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class QueryHintTest {
+public class QueryHintTest extends AbstractMongoConnectionTest {
final Logger TRACE_LOGGER = Logger.getLogger( "com.mongodb.TRACE" );
final TestHandler testHandler = new TestHandler();
@@ -51,19 +49,13 @@ public class QueryHintTest {
private Clock clock;
- @BeforeClass
- public static void checkMongoDbAvailable() {
- Assume.assumeNotNull(MongoUtils.getConnection());
- }
-
@Before
public void prepareStores() throws Exception {
clock = new Clock.Virtual();
- MongoConnection mc = MongoUtils.getConnection();
//TODO Temp mode to change the default setting so as to test it
//If we retain this feature then need to have better config support for it
System.setProperty("oak.mongo.maxDeltaForModTimeIdxSecs", "120");
- mongoDS = new MongoDocumentStore(mc.getDB(), new DocumentMK.Builder());
+ mongoDS = new MongoDocumentStore(mongoConnection.getDB(), new DocumentMK.Builder());
mongoDS.setClock(clock);
TRACE_LOGGER.addHandler(testHandler);
TRACE_LOGGER.setLevel(Level.FINEST);
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java?rev=1711053&r1=1711052&r2=1711053&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java Wed Oct 28 16:56:34 2015
@@ -22,21 +22,16 @@ package org.apache.jackrabbit.oak.plugin
import java.util.concurrent.TimeUnit;
import com.mongodb.ReadPreference;
+
+import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
-import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.Revision;
-import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -45,10 +40,7 @@ import static org.apache.jackrabbit.oak.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class ReadPreferenceIT {
-
- private DocumentNodeStore documentNodeStore;
- private NodeStore nodeStore;
+public class ReadPreferenceIT extends AbstractMongoConnectionTest {
private MongoDocumentStore mongoDS;
@@ -56,28 +48,17 @@ public class ReadPreferenceIT {
private long replicationLag;
- @BeforeClass
- public static void checkMongoDbAvailable() {
- Assume.assumeNotNull(MongoUtils.getConnection());
- }
-
- @Before
- public void prepareStores() throws Exception {
+ @Override
+ public void setUpConnection() throws Exception {
clock = new Clock.Virtual();
replicationLag = TimeUnit.SECONDS.toMillis(10);
- MongoConnection mc = MongoUtils.getConnection();
- documentNodeStore = new DocumentMK.Builder()
+ mongoConnection = connectionFactory.getConnection();
+ mk = new DocumentMK.Builder()
.setMaxReplicationLag(replicationLag, TimeUnit.MILLISECONDS)
- .setMongoDB(mc.getDB())
+ .setMongoDB(mongoConnection.getDB())
.setClusterId(1)
- .getNodeStore();
- mongoDS = (MongoDocumentStore) documentNodeStore.getDocumentStore();
- nodeStore = documentNodeStore;
- }
-
- @After
- public void clearDB() {
- MongoUtils.dropCollections(mongoDS.getDBCollection(NODES).getDB());
+ .open();
+ mongoDS = (MongoDocumentStore) mk.getDocumentStore();
}
@Test
@@ -131,6 +112,7 @@ public class ReadPreferenceIT {
ReadPreference testPref = ReadPreference.secondary();
mongoDS.getDBCollection(NODES).getDB().setReadPreference(testPref);
+ NodeStore nodeStore = mk.getNodeStore();
NodeBuilder b1 = nodeStore.getRoot().builder();
b1.child("x").child("y");
nodeStore.merge(b1, EmptyHook.INSTANCE, CommitInfo.EMPTY);