Skip to navigation
Skip to content

Code commits

Smack (master)

Florian Schmaus <flo@geekplace.eu> 08 May 2019 d20a2675a8f7d40c28d17a9b590dabc423257246 m

Make StanzaCollector final
- smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java (version d20a2675a8f7d40c28d17a9b590dabc423257246) (diffs)
- smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java (version d20a2675a8f7d40c28d17a9b590dabc423257246) (diffs)
Florian Schmaus <flo@geekplace.eu> 08 May 2019 f8de22478b1a8aa0767b90a147aafb544f66a3ab m

Double the timeout to 120s in MemoryLeakTestUtil
Because an failing test on Travis was observered using a timeout of
60s:

org.jivesoftware.smackx.muc.MucMemoryLeakTest > mucMemoryLeakTest FAILED
    java.lang.AssertionError: No reference found after 60000ms
        at org.junit.Assert.fail(Assert.java:88)
        at org.junit.Assert.assertTrue(Assert.java:41)
        at org.junit.Assert.assertNotNull(Assert.java:712)
        at org.jivesoftware.smack.util.MemoryLeakTestUtil.assertReferencesQueueSize(MemoryLeakTestUtil.java:110)
        at org.jivesoftware.smack.util.MemoryLeakTestUtil.noResourceLeakTest(MemoryLeakTestUtil.java:103)
        at org.jivesoftware.smackx.muc.MucMemoryLeakTest.mucMemoryLeakTest(MucMemoryLeakTest.java:29)
- smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java (version f8de22478b1a8aa0767b90a147aafb544f66a3ab) (diffs)
Florian Schmaus <flo@geekplace.eu> 08 May 2019 d2f5efcb206a68fbf4c94aa148c023aee254e89d m

Use StandardCharsets.(UTF_8|US_ASCII)
This also gets rid of a ton of UnsupportedEncodingException s.
Florian Schmaus <flo@geekplace.eu> 08 May 2019 f4ee7dd541986172f1fbbb5c22c0a8340fec53cf m

Update PowerMock to 2.0.2
and set Mockito 2's mock-maker-inline as MockMaker to allow mocking of
final classes.
- build.gradle (version f4ee7dd541986172f1fbbb5c22c0a8340fec53cf) (diffs)
- smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (version f4ee7dd541986172f1fbbb5c22c0a8340fec53cf) (diffs)