Author: markt
Date: Mon Nov 13 10:10:01 2017
New Revision: 1815070
URL: http://svn.apache.org/viewvc?rev=1815070&view=rev
Log:
Switch to non-static imports
- avoids checkstyle error
- broadly the same code volume (or less)
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestJarScanner.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 13 10:10:01 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Mon
Nov 13 10:10:01 2017
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.buf;
import java.io.UnsupportedEncodingException;
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Mon
Nov 13 10:10:01 2017
@@ -14,12 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.buf;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -30,13 +27,13 @@ public class TestCharChunk {
@Test
public void testEndsWith() {
CharChunk cc = new CharChunk();
- assertFalse(cc.endsWith("test"));
+ Assert.assertFalse(cc.endsWith("test"));
cc.setChars("xxtestxx".toCharArray(), 2, 4);
- assertTrue(cc.endsWith(""));
- assertTrue(cc.endsWith("t"));
- assertTrue(cc.endsWith("st"));
- assertTrue(cc.endsWith("test"));
- assertFalse(cc.endsWith("x"));
- assertFalse(cc.endsWith("xxtest"));
+ Assert.assertTrue(cc.endsWith(""));
+ Assert.assertTrue(cc.endsWith("t"));
+ Assert.assertTrue(cc.endsWith("st"));
+ Assert.assertTrue(cc.endsWith("test"));
+ Assert.assertFalse(cc.endsWith("x"));
+ Assert.assertFalse(cc.endsWith("xxtest"));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java Mon
Nov 13 10:10:01 2017
@@ -18,9 +18,7 @@ package org.apache.tomcat.util.buf;
import java.nio.charset.StandardCharsets;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestUDecoder {
@@ -34,7 +32,7 @@ public class TestUDecoder {
} catch (Exception e) {
exception = e;
}
- assertTrue(exception instanceof IllegalArgumentException);
+ Assert.assertTrue(exception instanceof IllegalArgumentException);
// Edge case trying to trigger ArrayIndexOutOfBoundsException
exception = null;
@@ -43,62 +41,62 @@ public class TestUDecoder {
} catch (Exception e) {
exception = e;
}
- assertTrue(exception instanceof IllegalArgumentException);
+ Assert.assertTrue(exception instanceof IllegalArgumentException);
}
@Test
public void testURLDecodeStringValidIso88591Start() {
String result = UDecoder.URLDecode("%41xxxx",
StandardCharsets.ISO_8859_1);
- assertEquals("Axxxx", result);
+ Assert.assertEquals("Axxxx", result);
}
@Test
public void testURLDecodeStringValidIso88591Middle() {
String result = UDecoder.URLDecode("xx%41xx",
StandardCharsets.ISO_8859_1);
- assertEquals("xxAxx", result);
+ Assert.assertEquals("xxAxx", result);
}
@Test
public void testURLDecodeStringValidIso88591End() {
String result = UDecoder.URLDecode("xxxx%41",
StandardCharsets.ISO_8859_1);
- assertEquals("xxxxA", result);
+ Assert.assertEquals("xxxxA", result);
}
@Test
public void testURLDecodeStringValidUtf8Start() {
String result = UDecoder.URLDecode("%c3%aaxxxx",
StandardCharsets.UTF_8);
- assertEquals("\u00eaxxxx", result);
+ Assert.assertEquals("\u00eaxxxx", result);
}
@Test
public void testURLDecodeStringValidUtf8Middle() {
String result = UDecoder.URLDecode("xx%c3%aaxx",
StandardCharsets.UTF_8);
- assertEquals("xx\u00eaxx", result);
+ Assert.assertEquals("xx\u00eaxx", result);
}
@Test
public void testURLDecodeStringValidUtf8End() {
String result = UDecoder.URLDecode("xxxx%c3%aa",
StandardCharsets.UTF_8);
- assertEquals("xxxx\u00ea", result);
+ Assert.assertEquals("xxxx\u00ea", result);
}
@Test
public void testURLDecodeStringNonAsciiValidNone() {
String result = UDecoder.URLDecode("\u00eaxxxx",
StandardCharsets.UTF_8);
- assertEquals("\u00eaxxxx", result);
+ Assert.assertEquals("\u00eaxxxx", result);
}
@Test
public void testURLDecodeStringNonAsciiValidUtf8() {
String result = UDecoder.URLDecode("\u00ea%c3%aa",
StandardCharsets.UTF_8);
- assertEquals("\u00ea\u00ea", result);
+ Assert.assertEquals("\u00ea\u00ea", result);
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
Mon Nov 13 10:10:01 2017
@@ -20,10 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.util.digester.Digester;
@@ -48,7 +45,7 @@ public class TestWebRuleSet {
WebXml webXml = new WebXml();
parse(webXml, "web-fragment-1name.xml", true, true);
- assertEquals("name1", webXml.getName());
+ Assert.assertEquals("name1", webXml.getName());
}
@@ -64,8 +61,8 @@ public class TestWebRuleSet {
WebXml webXml = new WebXml();
parse(webXml, "web-fragment-1ordering.xml", true, true);
- assertEquals(1, webXml.getBeforeOrdering().size());
- assertTrue(webXml.getBeforeOrdering().contains("bar"));
+ Assert.assertEquals(1, webXml.getBeforeOrdering().size());
+ Assert.assertTrue(webXml.getBeforeOrdering().contains("bar"));
}
@@ -81,8 +78,8 @@ public class TestWebRuleSet {
WebXml webXml = new WebXml();
parse(webXml, "web-1ordering.xml", false, true);
- assertEquals(1, webXml.getAbsoluteOrdering().size());
- assertTrue(webXml.getAbsoluteOrdering().contains("bar"));
+ Assert.assertEquals(1, webXml.getAbsoluteOrdering().size());
+ Assert.assertTrue(webXml.getAbsoluteOrdering().contains("bar"));
}
@@ -150,9 +147,9 @@ public class TestWebRuleSet {
}
if (expected) {
- assertTrue(result);
+ Assert.assertTrue(result);
} else {
- assertFalse(result);
+ Assert.assertFalse(result);
}
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java Mon
Nov 13 10:10:01 2017
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.http;
import java.io.IOException;
@@ -28,8 +27,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -55,7 +53,7 @@ public class TestBug49158 extends Cookie
ByteChunk res = new ByteChunk();
getUrl("http://localhost:"; + getPort() + "/"+path, res, headers);
List<String> cookieHeaders = headers.get("Set-Cookie");
- assertEquals("There should only be one Set-Cookie header in this test",
+ Assert.assertEquals("There should only be one Set-Cookie header in
this test",
1, cookieHeaders.size());
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
Mon Nov 13 10:10:01 2017
@@ -20,8 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -46,26 +45,24 @@ public class TestCookiesDefaultSysProps
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/invalid");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/null");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/blank");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidFwd");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidStrict");
- assertEquals("Cookie name ok", res.toString());
+ Assert.assertEquals("Cookie name ok", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/valid");
- assertEquals("Cookie name ok", res.toString());
+ Assert.assertEquals("Cookie name ok", res.toString());
// Need to read response headers to test version switching
Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/switch", res, headers);
List<String> cookieHeaders = headers.get("Set-Cookie");
for (String cookieHeader : cookieHeaders) {
- assertEquals("name=\"val?ue\"; Version=1", cookieHeader);
+ Assert.assertEquals("name=\"val?ue\"; Version=1", cookieHeader);
}
-
}
-
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
Mon Nov 13 10:10:01 2017
@@ -16,8 +16,7 @@
*/
package org.apache.tomcat.util.http;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -47,18 +46,16 @@ public class TestCookiesNoFwdStrictSysPr
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/invalid");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/null");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/blank");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidFwd");
- assertEquals("Cookie name ok", res.toString());
+ Assert.assertEquals("Cookie name ok", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidStrict");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/valid");
- assertEquals("Cookie name ok", res.toString());
-
+ Assert.assertEquals("Cookie name ok", res.toString());
}
-
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
Mon Nov 13 10:10:01 2017
@@ -16,8 +16,7 @@
*/
package org.apache.tomcat.util.http;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -47,17 +46,16 @@ public class TestCookiesNoStrictNamingSy
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/invalid");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/null");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/blank");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidFwd");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidStrict");
- assertEquals("Cookie name ok", res.toString());
+ Assert.assertEquals("Cookie name ok", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/valid");
- assertEquals("Cookie name ok", res.toString());
-
+ Assert.assertEquals("Cookie name ok", res.toString());
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
Mon Nov 13 10:10:01 2017
@@ -20,8 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -49,26 +48,24 @@ public class TestCookiesStrictSysProps e
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/invalid");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/null");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/blank");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidFwd");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidStrict");
- assertEquals("Cookie name fail", res.toString());
+ Assert.assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/valid");
- assertEquals("Cookie name ok", res.toString());
+ Assert.assertEquals("Cookie name ok", res.toString());
// Need to read response headers to test version switching
Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/switch", res, headers);
List<String> cookieHeaders = headers.get("Set-Cookie");
for (String cookieHeader : cookieHeaders) {
- assertEquals("name=\"val?ue\"; Version=1", cookieHeader);
+ Assert.assertEquals("name=\"val?ue\"; Version=1", cookieHeader);
}
-
}
-
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
Mon Nov 13 10:10:01 2017
@@ -25,10 +25,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -93,20 +90,20 @@ public class TestMimeHeadersIntegration
if (successExpected) {
alv.validateAccessLog(1, 200, 0, 3000);
// Response 200
- assertTrue("Response line is: " + client.getResponseLine(),
+ Assert.assertTrue("Response line is: " + client.getResponseLine(),
client.getResponseLine() != null &&
client.isResponse200());
- assertEquals("OK", client.getResponseBody());
+ Assert.assertEquals("OK", client.getResponseBody());
} else {
alv.validateAccessLog(1, 400, 0, 0);
// Connection aborted or response 400
- assertTrue("Response line is: " + client.getResponseLine(),
+ Assert.assertTrue("Response line is: " + client.getResponseLine(),
client.getResponseLine() == null ||
client.isResponse400());
}
int maxHeaderCount =
((Integer)
tomcat.getConnector().getProperty("maxHeaderCount")).intValue();
- assertEquals(expectedMaxHeaderCount, maxHeaderCount);
+ Assert.assertEquals(expectedMaxHeaderCount, maxHeaderCount);
if (maxHeaderCount > 0) {
- assertEquals(maxHeaderCount, alv.arraySize);
+ Assert.assertEquals(maxHeaderCount, alv.arraySize);
} else if (maxHeaderCount < 0) {
int maxHttpHeaderSize = ((Integer) tomcat.getConnector()
.getAttribute("maxHttpHeaderSize")).intValue();
@@ -116,7 +113,7 @@ public class TestMimeHeadersIntegration
while (arraySize < headerCount) {
arraySize <<= 1;
}
- assertEquals(arraySize, alv.arraySize);
+ Assert.assertEquals(arraySize, alv.arraySize);
}
}
@@ -167,7 +164,7 @@ public class TestMimeHeadersIntegration
headersArrayField.setAccessible(true);
arraySize = ((Object[]) headersArrayField.get(mh)).length;
} catch (Exception ex) {
- assertNull(ex.getMessage(), ex);
+ Assert.assertNull(ex.getMessage(), ex);
}
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestRequestUtil.java
Mon Nov 13 10:10:01 2017
@@ -16,8 +16,7 @@
*/
package org.apache.tomcat.util.http;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestRequestUtil {
@@ -158,6 +157,6 @@ public class TestRequestUtil {
}
private void doTestNormalize(String input, String expected) {
- assertEquals(expected,RequestUtil.normalize(input));
+ Assert.assertEquals(expected,RequestUtil.normalize(input));
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
Mon Nov 13 10:10:01 2017
@@ -18,9 +18,7 @@ package org.apache.tomcat.util.net;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -71,14 +69,14 @@ public class TestClientCert extends Tomc
(count > 0 ?
TesterSupport.getLastClientAuthRequestedIssuer(0).getName() : "NONE"));
log.debug("Expected requested Issuer: " +
TesterSupport.getClientAuthExpectedIssuer());
}
- assertTrue("Checking requested client issuer against " +
- TesterSupport.getClientAuthExpectedIssuer(),
- TesterSupport.checkLastClientAuthRequestedIssuers());
+ Assert.assertTrue("Checking requested client issuer against " +
+ TesterSupport.getClientAuthExpectedIssuer(),
+ TesterSupport.checkLastClientAuthRequestedIssuers());
if (preemptive) {
- assertEquals("OK-" + TesterSupport.ROLE, res.toString());
+ Assert.assertEquals("OK-" + TesterSupport.ROLE, res.toString());
} else {
- assertEquals("OK", res.toString());
+ Assert.assertEquals("OK", res.toString());
}
// Protected resource
@@ -91,11 +89,11 @@ public class TestClientCert extends Tomc
(count > 0 ?
TesterSupport.getLastClientAuthRequestedIssuer(0).getName() : "NONE"));
log.debug("Expected requested Issuer: " +
TesterSupport.getClientAuthExpectedIssuer());
}
- assertTrue("Checking requested client issuer against " +
- TesterSupport.getClientAuthExpectedIssuer(),
- TesterSupport.checkLastClientAuthRequestedIssuers());
+ Assert.assertTrue("Checking requested client issuer against " +
+ TesterSupport.getClientAuthExpectedIssuer(),
+ TesterSupport.checkLastClientAuthRequestedIssuers());
- assertEquals("OK-" + TesterSupport.ROLE, res.toString());
+ Assert.assertEquals("OK-" + TesterSupport.ROLE, res.toString());
}
@Test
@@ -140,11 +138,11 @@ public class TestClientCert extends Tomc
(count > 0 ?
TesterSupport.getLastClientAuthRequestedIssuer(0).getName() : "NONE"));
log.debug("Expected requested Issuer: " +
TesterSupport.getClientAuthExpectedIssuer());
}
- assertTrue("Checking requested client issuer against " +
- TesterSupport.getClientAuthExpectedIssuer(),
- TesterSupport.checkLastClientAuthRequestedIssuers());
+ Assert.assertTrue("Checking requested client issuer against " +
+ TesterSupport.getClientAuthExpectedIssuer(),
+ TesterSupport.checkLastClientAuthRequestedIssuers());
- assertEquals("OK-" + bodySize, res.toString());
+ Assert.assertEquals("OK-" + bodySize, res.toString());
// Protected resource
res.recycle();
@@ -158,14 +156,14 @@ public class TestClientCert extends Tomc
(count > 0 ?
TesterSupport.getLastClientAuthRequestedIssuer(0).getName() : "NONE"));
log.debug("Expected requested Issuer: " +
TesterSupport.getClientAuthExpectedIssuer());
}
- assertTrue("Checking requested client issuer against " +
- TesterSupport.getClientAuthExpectedIssuer(),
- TesterSupport.checkLastClientAuthRequestedIssuers());
+ Assert.assertTrue("Checking requested client issuer against " +
+ TesterSupport.getClientAuthExpectedIssuer(),
+ TesterSupport.checkLastClientAuthRequestedIssuers());
if (expectProtectedFail) {
- assertEquals(401, rc);
+ Assert.assertEquals(401, rc);
} else {
- assertEquals("OK-" + bodySize, res.toString());
+ Assert.assertEquals("OK-" + bodySize, res.toString());
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Mon
Nov 13 10:10:01 2017
@@ -21,10 +21,7 @@ import java.net.SocketException;
import javax.net.ssl.SSLException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -88,7 +85,7 @@ public class TestCustomSsl extends Tomca
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
- assertTrue(res.toString().indexOf("<a href=\"../helloworld.html\">") >
0);
+ Assert.assertTrue(res.toString().indexOf("<a
href=\"../helloworld.html\">") > 0);
}
@Test
@@ -122,7 +119,7 @@ public class TestCustomSsl extends Tomca
((AbstractHttp11JsseProtocol<?>) handler).setTruststoreFile(null);
} else {
// Unexpected
- fail("Unexpected handler type");
+ Assert.fail("Unexpected handler type");
}
if (trustType.equals(TrustType.ALL)) {
tomcat.getConnector().setAttribute("trustManagerClassName",
@@ -140,7 +137,7 @@ public class TestCustomSsl extends Tomca
// Unprotected resource
ByteChunk res =
getUrl("https://localhost:"; + getPort() + "/unprotected");
- assertEquals("OK", res.toString());
+ Assert.assertEquals("OK", res.toString());
// Protected resource
res.recycle();
@@ -150,12 +147,12 @@ public class TestCustomSsl extends Tomca
null, null);
} catch (SocketException se) {
if (!trustType.equals(TrustType.NONE)) {
- fail(se.getMessage());
+ Assert.fail(se.getMessage());
se.printStackTrace();
}
} catch (SSLException he) {
if (!trustType.equals(TrustType.NONE)) {
- fail(he.getMessage());
+ Assert.fail(he.getMessage());
he.printStackTrace();
}
}
@@ -168,17 +165,17 @@ public class TestCustomSsl extends Tomca
(count > 0 ?
TesterSupport.getLastClientAuthRequestedIssuer(0).getName() : "NONE"));
log.debug("Expected requested Issuer: " +
TesterSupport.getClientAuthExpectedIssuer());
}
- assertTrue("Checking requested client issuer against " +
- TesterSupport.getClientAuthExpectedIssuer(),
- TesterSupport.checkLastClientAuthRequestedIssuers());
+ Assert.assertTrue("Checking requested client issuer against " +
+ TesterSupport.getClientAuthExpectedIssuer(),
+ TesterSupport.checkLastClientAuthRequestedIssuers());
}
if (trustType.equals(TrustType.NONE)) {
- assertTrue(rc != 200);
- assertEquals("", res.toString());
+ Assert.assertTrue(rc != 200);
+ Assert.assertEquals("", res.toString());
} else {
- assertEquals(200, rc);
- assertEquals("OK-" + TesterSupport.ROLE, res.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK-" + TesterSupport.ROLE, res.toString());
}
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java Mon Nov
13 10:10:01 2017
@@ -29,8 +29,6 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -66,9 +64,9 @@ public class TestSsl extends TomcatBaseT
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
- assertTrue(res.toString().indexOf("<a href=\"../helloworld.html\">") >
0);
- assertTrue("Checking no client issuer has been requested",
- TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
+ Assert.assertTrue(res.toString().indexOf("<a
href=\"../helloworld.html\">") > 0);
+ Assert. assertTrue("Checking no client issuer has been requested",
+ TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
}
@Test
@@ -88,9 +86,9 @@ public class TestSsl extends TomcatBaseT
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
- assertTrue(res.toString().indexOf("<a href=\"../helloworld.html\">") >
0);
- assertTrue("Checking no client issuer has been requested",
- TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
+ Assert.assertTrue(res.toString().indexOf("<a
href=\"../helloworld.html\">") > 0);
+ Assert.assertTrue("Checking no client issuer has been requested",
+ TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
}
@@ -122,8 +120,8 @@ public class TestSsl extends TomcatBaseT
Reader r = new InputStreamReader(is);
doRequest(os, r);
- assertTrue("Checking no client issuer has been requested",
- TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
+ Assert.assertTrue("Checking no client issuer has been requested",
+ TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
TesterHandshakeListener listener = new TesterHandshakeListener();
socket.addHandshakeCompletedListener(listener);
@@ -137,8 +135,8 @@ public class TestSsl extends TomcatBaseT
while (requestCount < 10) {
requestCount++;
doRequest(os, r);
- assertTrue("Checking no client issuer has been requested",
-
TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
+ Assert.assertTrue("Checking no client issuer has been
requested",
+ TesterSupport.getLastClientAuthRequestedIssuerCount()
== 0);
if (listener.isComplete() && listenerComplete == 0) {
listenerComplete = requestCount;
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
Mon Nov 13 10:10:01 2017
@@ -14,17 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.net;
import java.io.File;
import java.net.InetAddress;
import java.net.ServerSocket;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.connector.Connector;
@@ -130,9 +126,9 @@ public class TestXxxEndpoint extends Tom
// This should throw an Exception
if (isApr) {
pool = createAprPool();
- assertTrue(pool != 0);
+ Assert.assertTrue(pool != 0);
nativeSocket = createAprSocket(port, pool);
- assertTrue(nativeSocket != 0);
+ Assert.assertTrue(nativeSocket != 0);
} else {
s = new ServerSocket(port, 100,
InetAddress.getByName("localhost"));
@@ -151,7 +147,7 @@ public class TestXxxEndpoint extends Tom
if (e != null) {
log.info("Exception was", e);
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
tomcat.getConnector().start();
}
@@ -178,9 +174,9 @@ public class TestXxxEndpoint extends Tom
// This should not throw an Exception
if (isApr) {
pool = createAprPool();
- assertTrue(pool != 0);
+ Assert.assertTrue(pool != 0);
nativeSocket = createAprSocket(port, pool);
- assertTrue(nativeSocket != 0);
+ Assert.assertTrue(nativeSocket != 0);
} else {
s = new ServerSocket(port, 100,
InetAddress.getByName("localhost"));
@@ -196,7 +192,7 @@ public class TestXxxEndpoint extends Tom
}
} catch (Exception e2) { /* Ignore */ }
}
- assertNull(e);
+ Assert.assertNull(e);
tomcat.getConnector().start();
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
Mon Nov 13 10:10:01 2017
@@ -22,11 +22,7 @@ import java.util.Set;
import org.hamcrest.CoreMatchers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -54,7 +50,7 @@ public class TestOpenSSLConf extends Tom
String sslImplementation = String.valueOf(
tomcat.getConnector().getProperty("sslImplementationName"));
Assume.assumeTrue("This test is only for OpenSSL based SSL
connectors",
- sslImplementation.contains("openssl"));
+ sslImplementation.contains("openssl"));
}
OpenSSLConfCmd cmd = new OpenSSLConfCmd();
@@ -64,13 +60,13 @@ public class TestOpenSSLConf extends Tom
conf.addCmd(cmd);
SSLHostConfig[] sslHostConfigs = tomcat.getConnector().
getProtocolHandler().findSslHostConfigs();
- assertEquals("Wrong SSLHostConfigCount", 1, sslHostConfigs.length);
+ Assert.assertEquals("Wrong SSLHostConfigCount", 1,
sslHostConfigs.length);
sslHostConfigs[0].setOpenSslConf(conf);
tomcat.start();
sslHostConfigs =
tomcat.getConnector().getProtocolHandler().findSslHostConfigs();
- assertEquals("Wrong SSLHostConfigCount", 1, sslHostConfigs.length);
+ Assert.assertEquals("Wrong SSLHostConfigCount", 1,
sslHostConfigs.length);
return sslHostConfigs[0];
}
@@ -79,11 +75,11 @@ public class TestOpenSSLConf extends Tom
SSLHostConfig sslHostConfig = initOpenSSLConfCmdCipher("CipherString",
ENABLED_CIPHER);
String[] ciphers = sslHostConfig.getEnabledCiphers();
- assertThat("Wrong HostConfig ciphers", ciphers,
- CoreMatchers.is(EXPECTED_CIPHERS));
+ Assert.assertThat("Wrong HostConfig ciphers", ciphers,
+ CoreMatchers.is(EXPECTED_CIPHERS));
ciphers =
SSLContext.getCiphers(sslHostConfig.getOpenSslContext().longValue());
- assertThat("Wrong native SSL context ciphers", ciphers,
- CoreMatchers.is(EXPECTED_CIPHERS));
+ Assert.assertThat("Wrong native SSL context ciphers", ciphers,
+ CoreMatchers.is(EXPECTED_CIPHERS));
}
@Test
@@ -100,13 +96,13 @@ public class TestOpenSSLConf extends Tom
sb.substring(1));
String[] protocols = sslHostConfig.getEnabledProtocols();
for (String protocol : protocols) {
- assertFalse("Protocol " + protocol + " is not allowed",
- disabledProtocols.contains(protocol));
+ Assert.assertFalse("Protocol " + protocol + " is not allowed",
+ disabledProtocols.contains(protocol));
}
Set<String> enabledProtocols = new HashSet<>(Arrays.asList(protocols));
for (String protocol : ENABLED_PROTOCOLS) {
- assertTrue("Protocol " + protocol + " is not enabled",
- enabledProtocols.contains(protocol));
+ Assert.assertTrue("Protocol " + protocol + " is not enabled",
+ enabledProtocols.contains(protocol));
}
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
Mon Nov 13 10:10:01 2017
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.res;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestStringManager {
@@ -35,7 +33,7 @@ public class TestStringManager {
} catch (IllegalArgumentException iae) {
iaeThrown = true;
}
- assertTrue("IAE not thrown on null key", iaeThrown);
+ Assert.assertTrue("IAE not thrown on null key", iaeThrown);
}
@Test
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestJarScanner.java?rev=1815070&r1=1815069&r2=1815070&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestJarScanner.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestJarScanner.java
Mon Nov 13 10:10:01 2017
@@ -14,16 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.scan;
import java.util.StringTokenizer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -34,18 +29,18 @@ public class TestJarScanner extends Tomc
public void testJarsToSkipFormat() {
String jarList = System.getProperty(Constants.SKIP_JARS_PROPERTY);
- assertNotNull("Jar skip list is null", jarList);
- assertFalse("Jar skip list is empty", jarList.isEmpty());
+ Assert.assertNotNull("Jar skip list is null", jarList);
+ Assert.assertFalse("Jar skip list is empty", jarList.isEmpty());
StringTokenizer tokenizer = new StringTokenizer(jarList, ",");
String token;
while (tokenizer.hasMoreElements()) {
token = tokenizer.nextToken();
- assertTrue("Token \"" + token + "\" does not end with \".jar\"",
- token.endsWith(".jar"));
- assertEquals("Token \"" + token + "\" contains sub string
\".jar\"" +
- " or separator \",\" is missing",
- token.length() - ".jar".length(),
- token.indexOf(".jar"));
+ Assert.assertTrue("Token \"" + token + "\" does not end with
\".jar\"",
+ token.endsWith(".jar"));
+ Assert.assertEquals("Token \"" + token + "\" contains sub string
\".jar\"" +
+ " or separator \",\" is missing",
+ token.length() - ".jar".length(),
+ token.indexOf(".jar"));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
