Index: modules/prefs/src/test/java/tests/api/java/util/prefs/PreferencesTest.java =================================================================== --- modules/prefs/src/test/java/tests/api/java/util/prefs/PreferencesTest.java (revision 394268) +++ modules/prefs/src/test/java/tests/api/java/util/prefs/PreferencesTest.java (working copy) @@ -71,7 +71,7 @@ assertEquals("System Preference Node: " + p.absolutePath(), p .toString()); assertEquals(0, p.childrenNames().length); - assertEquals(p.keys().length, 0); + assertEquals(0, p.keys().length); parent.removeNode(); try { p = Preferences.userNodeForPackage(null); @@ -90,7 +90,7 @@ assertEquals("System Preference Node: " + p.absolutePath(), p .toString()); // assertEquals(0, p.childrenNames().length); - // assertEquals(p.keys().length, 0); + // assertEquals(0, p.keys().length); } public void testConsts() { @@ -110,7 +110,7 @@ assertEquals("lang", p.name()); assertEquals("User Preference Node: " + p.absolutePath(), p.toString()); assertEquals(0, p.childrenNames().length); - assertEquals(p.keys().length, 0); + assertEquals(0, p.keys().length); try { p = Preferences.userNodeForPackage(null); @@ -128,7 +128,7 @@ assertEquals("", p.name()); assertEquals("User Preference Node: " + p.absolutePath(), p.toString()); // assertEquals(0, p.childrenNames().length); - // assertEquals(p.keys().length, 0); + // assertEquals(0, p.keys().length); } public void testImportPreferences() throws Exception { Index: modules/prefs/src/test/java/tests/api/java/util/prefs/AbstractPreferencesTest.java =================================================================== --- modules/prefs/src/test/java/tests/api/java/util/prefs/AbstractPreferencesTest.java (revision 394268) +++ modules/prefs/src/test/java/tests/api/java/util/prefs/AbstractPreferencesTest.java (working copy) @@ -210,8 +210,8 @@ assertEquals("testClearValue", pref.get("testClearKey", null)); assertEquals("testClearValue1", pref.get("testClearKey1", null)); pref.clear(); - assertEquals(null, pref.get("testClearKey", null)); - assertEquals(null, pref.get("testClearKey1", null)); + assertNull(pref.get("testClearKey", null)); + assertNull(pref.get("testClearKey1", null)); } public void testGet() throws BackingStoreException { Index: modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/KeyAgreementTest1.java (working copy) @@ -127,11 +127,11 @@ KeyAgreementSpi spi = new MyKeyAgreementSpi(); KeyAgreement keyA = new myKeyAgreement(spi, defaultProvider, defaultAlgorithm); - assertEquals("Incorrect algorithm", keyA.getAlgorithm(), - defaultAlgorithm); - assertEquals("Incorrect provider", keyA.getProvider(), defaultProvider); + assertEquals("Incorrect algorithm", + defaultAlgorithm, keyA.getAlgorithm()); + assertEquals("Incorrect provider", defaultProvider, keyA.getProvider()); assertNull("Incorrect result", keyA.doPhase(null, true)); - assertEquals("Incorrect result", keyA.generateSecret().length, 0); + assertEquals("Incorrect result", 0, keyA.generateSecret().length); keyA = new myKeyAgreement(null, null, null); assertNull("Algorithm must be null", keyA.getAlgorithm()); Index: modules/crypto/src/test/java/javax/crypto/CipherInputStreamTest.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/CipherInputStreamTest.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/CipherInputStreamTest.java (working copy) @@ -246,7 +246,7 @@ CipherInputStream cis = new CipherInputStream(tis, new NullCipher()); try { assertEquals("The returned by available() method value " - + "should be 0.", cis.available(), 0); + + "should be 0.", 0, cis.available()); } catch (IOException e) { e.printStackTrace(); fail("Unexpected IOException was thrown."); Index: modules/crypto/src/test/java/javax/crypto/CipherSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/CipherSpiTests.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/CipherSpiTests.java (working copy) @@ -57,22 +57,22 @@ BadPaddingException, ShortBufferException { CipherSpi cSpi = new myCipherSpi(); - assertEquals("BlockSize is not 0", cSpi.engineGetBlockSize(), 0); - assertEquals("OutputSize is not 0", cSpi.engineGetOutputSize(1), 0); + assertEquals("BlockSize is not 0", 0, cSpi.engineGetBlockSize()); + assertEquals("OutputSize is not 0", 0, cSpi.engineGetOutputSize(1)); byte[] bb = cSpi.engineGetIV(); - assertEquals("Length of result byte array is not 0", bb.length, 0); + assertEquals("Length of result byte array is not 0", 0, bb.length); assertNull("Not null result", cSpi.engineGetParameters()); byte[] bb1 = new byte[10]; byte[] bb2 = new byte[10]; bb = cSpi.engineUpdate(bb1, 1, 2); assertEquals("Incorrect result of engineUpdate(byte, int, int)", - bb.length, 2); + 2, bb.length); bb = cSpi.engineDoFinal(bb1, 1, 2); - assertEquals("Incorrect result of enfineDoFinal(byte, int, int)", 2, - bb.length); + assertEquals("Incorrect result of enfineDoFinal(byte, int, int)", + 2, bb.length); assertEquals( "Incorrect result of enfineUpdate(byte, int, int, byte, int)", - cSpi.engineUpdate(bb1, 1, 2, bb2, 7), 2); + 2, cSpi.engineUpdate(bb1, 1, 2, bb2, 7)); assertEquals( "Incorrect result of enfineDoFinal(byte, int, int, byte, int)", 2, cSpi.engineDoFinal(bb1, 1, 2, bb2, 0)); @@ -86,12 +86,10 @@ CipherSpi cSpi = new myCipherSpi(); try { cSpi.engineGetKeySize(null); - assertTrue("UnsupportedOperationException must be thrown", false); + fail("UnsupportedOperationException must be thrown"); } catch (UnsupportedOperationException e) { } catch (Exception e) { - assertTrue( - "Unexpected ".concat(e.toString()).concat(" was thrown"), - false); + fail("Unexpected ".concat(e.toString()).concat(" was thrown")); } } @@ -103,12 +101,10 @@ CipherSpi cSpi = new myCipherSpi(); try { cSpi.engineWrap(null); - assertTrue("UnsupportedOperationException must be thrown", false); + fail("UnsupportedOperationException must be thrown"); } catch (UnsupportedOperationException e) { } catch (Exception e) { - assertTrue( - "Unexpected ".concat(e.toString()).concat(" was thrown"), - false); + fail("Unexpected ".concat(e.toString()).concat(" was thrown")); } } @@ -120,12 +116,10 @@ CipherSpi cSpi = new myCipherSpi(); try { cSpi.engineUnwrap(new byte[0], "", 0); - assertTrue("UnsupportedOperationException must be thrown", false); + fail("UnsupportedOperationException must be thrown"); } catch (UnsupportedOperationException e) { } catch (Exception e) { - assertTrue( - "Unexpected ".concat(e.toString()).concat(" was thrown"), - false); + fail("Unexpected ".concat(e.toString()).concat(" was thrown")); } } Index: modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/ExemptionMechanismTest1.java (working copy) @@ -119,9 +119,11 @@ exMech.init(key); byte [] bbRes = exMech.genExemptionBlob(); - assertEquals("Incorrect length", bbRes.length, len); - assertEquals("Incorrect result", exMech.genExemptionBlob(new byte[5]), 5); - assertEquals("Incorrect result", exMech.genExemptionBlob(bbRes), len); + assertEquals("Incorrect length", len, bbRes.length); + assertEquals("Incorrect result", + 5, exMech.genExemptionBlob(new byte[5])); + assertEquals("Incorrect result", + len, exMech.genExemptionBlob(bbRes)); try { exMech.genExemptionBlob(new byte[1], len); fail("ShortBufferException must be thrown"); @@ -133,10 +135,12 @@ } catch (ShortBufferException e) { } - assertEquals("Incorrect result", exMech.genExemptionBlob(byteA, 1), 9); - assertEquals("Incorrect result", exMech.genExemptionBlob(new byte[20], (len - 2)), len); + assertEquals("Incorrect result", + 9, exMech.genExemptionBlob(byteA, 1)); + assertEquals("Incorrect result", + len, exMech.genExemptionBlob(new byte[20], (len - 2))); - assertEquals("Incorrect output size", exMech.getOutputSize(100), 5); + assertEquals("Incorrect output size", 5, exMech.getOutputSize(100)); AlgorithmParameters params = null; exMech.init(key, params); Index: modules/crypto/src/test/java/javax/crypto/KeyAgreementSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyAgreementSpiTests.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/KeyAgreementSpiTests.java (working copy) @@ -61,10 +61,9 @@ } catch (IllegalStateException e) { } byte[] bb = kaSpi.engineGenerateSecret(); - assertEquals("Length is not 0", bb.length, 0); - assertEquals("Returned integer is not 0", - kaSpi.engineGenerateSecret(new byte[1], 10), - -1); + assertEquals("Length is not 0", 0, bb.length); + assertEquals("Returned integer is not 0", + -1, kaSpi.engineGenerateSecret(new byte[1], 10)); assertNull("Not null result", kaSpi.engineGenerateSecret("aaa")); try { kaSpi.engineGenerateSecret(""); Index: modules/crypto/src/test/java/javax/crypto/MacTest1.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/MacTest1.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/MacTest1.java (working copy) @@ -768,7 +768,7 @@ fail("Exception should be thrown because init(..) uses incorrect parameters"); } catch (Exception e) { } - assertEquals("Invalid mac length", mac.getMacLength(), 0); + assertEquals("Invalid mac length", 0, mac.getMacLength()); mac = new myMac(null, null, null); assertNull("Algorithm must be null", mac.getAlgorithm()); Index: modules/crypto/src/test/java/javax/crypto/MacSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/MacSpiTests.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/MacSpiTests.java (working copy) @@ -59,7 +59,7 @@ byte [] bb1 = {(byte)1, (byte)2, (byte)3, (byte)4, (byte)5}; SecretKeySpec sks = new SecretKeySpec(bb1, "SHA1"); - assertEquals("Incorrect MacLength", mSpi.engineGetMacLength(), 0); + assertEquals("Incorrect MacLength", 0, mSpi.engineGetMacLength()); try { mSpi.engineInit(null, null); @@ -70,7 +70,7 @@ mSpi.engineInit(sks, null); byte[] bb = mSpi.engineDoFinal(); - assertEquals(bb.length, 0); + assertEquals(0, bb.length); try { mSpi.clone(); fail("CloneNotSupportedException was not thrown as expected"); Index: modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/KeyAgreementTest2.java (working copy) @@ -97,10 +97,9 @@ } catch (IllegalStateException e) { } byte[] bb = keyAgr.generateSecret(); - assertEquals("Length is not 0", bb.length, 0); + assertEquals("Length is not 0", 0, bb.length); assertEquals("Returned integer is not 0", - keyAgr.generateSecret(new byte[1], 10), - -1); + -1, keyAgr.generateSecret(new byte[1], 10)); assertNull("Not null result", keyAgr.generateSecret("aaa")); try { keyAgr.generateSecret(""); Index: modules/crypto/src/test/java/javax/crypto/MacTest2.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/MacTest2.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/MacTest2.java (working copy) @@ -89,17 +89,17 @@ protected void checkResult(Mac mac) throws InvalidKeyException, InvalidAlgorithmParameterException { - assertEquals("Incorrect MacLength", mac.getMacLength(), 0); + assertEquals("Incorrect MacLength", 0, mac.getMacLength()); byte [] b = {(byte)0, (byte)0, (byte)0, (byte)0, (byte)0}; SecretKeySpec scs = new SecretKeySpec(b, "SHA1"); AlgParSpec parms = new AlgParSpec(); tmpKey tKey = new tmpKey(); mac.init(scs); byte[] bb = mac.doFinal(); - assertEquals(bb.length, 0); + assertEquals(0, bb.length); mac.reset(); bb = mac.doFinal(); - assertEquals(bb.length, 1); + assertEquals(1, bb.length); try { mac.init(null); fail("InvalidKeyException should be thrown"); Index: modules/crypto/src/test/java/javax/crypto/ExemptionMechanismSpiTests.java =================================================================== --- modules/crypto/src/test/java/javax/crypto/ExemptionMechanismSpiTests.java (revision 394268) +++ modules/crypto/src/test/java/javax/crypto/ExemptionMechanismSpiTests.java (working copy) @@ -57,10 +57,11 @@ ExemptionMechanismSpi emSpi = new MyExemptionMechanismSpi(); int len = MyExemptionMechanismSpi.getLength(); byte [] bbRes = emSpi.engineGenExemptionBlob(); - assertEquals("Incorrect length", bbRes.length, len); + assertEquals("Incorrect length", len, bbRes.length); assertEquals("Incorrect result", - emSpi.engineGenExemptionBlob(new byte[1], len), len); - assertEquals("Incorrect output size", emSpi.engineGetOutputSize(100), 5); + len, emSpi.engineGenExemptionBlob(new byte[1], len)); + assertEquals("Incorrect output size", + 5, emSpi.engineGetOutputSize(100)); Key key = null; AlgorithmParameters params = null; AlgorithmParameterSpec parSpec = null; @@ -100,6 +101,6 @@ emSpi.engineInit(key, params); emSpi.engineInit(key, parSpec); - assertEquals("Incorrect result", emSpi.engineGetOutputSize(100),5); + assertEquals("Incorrect result", 5, emSpi.engineGetOutputSize(100)); } } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/MalformedInputExceptionTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/MalformedInputExceptionTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/MalformedInputExceptionTest.java (working copy) @@ -30,17 +30,17 @@ MalformedInputException ex = new MalformedInputException(3); assertTrue(ex instanceof CharacterCodingException); assertNull(ex.getCause()); - assertEquals(ex.getInputLength(), 3); + assertEquals(3, ex.getInputLength()); assertTrue(ex.getMessage().indexOf("3") != -1); ex = new MalformedInputException(-3); assertNull(ex.getCause()); - assertEquals(ex.getInputLength(), -3); + assertEquals(-3, ex.getInputLength()); assertTrue(ex.getMessage().indexOf("-3") != -1); ex = new MalformedInputException(0); assertNull(ex.getCause()); - assertEquals(ex.getInputLength(), 0); + assertEquals(0, ex.getInputLength()); assertTrue(ex.getMessage().indexOf("0") != -1); } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CoderMalfunctionErrorTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CoderMalfunctionErrorTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CoderMalfunctionErrorTest.java (working copy) @@ -50,7 +50,7 @@ CoderMalfunctionError deEx = (CoderMalfunctionError) SerializationTester .getDeserilizedObject(ex); - assertEquals(null, deEx.getCause()); + assertNull(deEx.getCause()); } /* @@ -62,6 +62,6 @@ CoderMalfunctionError deEx = (CoderMalfunctionError) SerializationTester .readObject(ex, "tests/api/java/nio/charset/CoderMalfunctionError.ser"); - assertEquals(null, deEx.getCause()); + assertNull(deEx.getCause()); } } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java (working copy) @@ -85,7 +85,7 @@ assertSame(CodingErrorAction.REPORT, decoder.malformedInputAction()); assertSame(CodingErrorAction.REPORT, decoder .unmappableCharacterAction()); - assertEquals(decoder.replacement(), "\ufffd"); + assertEquals("\ufffd", decoder.replacement()); } /* @@ -219,7 +219,7 @@ // normal case ByteBuffer in = ByteBuffer.wrap(getUnibytes()); out = decoder.decode(in); - assertEquals(out.position(), 0); + assertEquals(0, out.position()); assertEquals(out.limit(), unistr.length()); assertEquals(out.remaining(), unistr.length()); assertEquals(new String(out.array(), 0, out.limit()), unistr); @@ -317,10 +317,10 @@ in.rewind(); out.rewind(); assertSame(CoderResult.UNDERFLOW, decoder.decode(in, out, true)); - assertEquals(out.limit(), 100); + assertEquals(100, out.limit()); assertEquals(out.position(), unistr.length()); assertEquals(out.remaining(), 100 - unistr.length()); - assertEquals(out.capacity(), 100); + assertEquals(100, out.capacity()); assertCharBufferValue(out, unistr); decoder.flush(out); @@ -330,10 +330,10 @@ in.rewind(); out.clear(); assertSame(CoderResult.UNDERFLOW, decoder.decode(in, out, false)); - assertEquals(out.limit(), 100); + assertEquals(100, out.limit()); assertEquals(out.position(), unistr.length()); assertEquals(out.remaining(), 100 - unistr.length()); - assertEquals(out.capacity(), 100); + assertEquals(100, out.capacity()); assertCharBufferValue(out, unistr); decoder.reset(); @@ -344,10 +344,10 @@ assertSame(CoderResult.UNDERFLOW, decoder.decode(in, out, false)); in.rewind(); assertSame(CoderResult.UNDERFLOW, decoder.decode(in, out, true)); - assertEquals(out.limit(), 100); + assertEquals(100, out.limit()); assertTrue(out.position() > 0); assertEquals(out.remaining(), out.capacity() - out.position()); - assertEquals(out.capacity(), 100); + assertEquals(100, out.capacity()); assertCharBufferValue(out, unistr + unistr + unistr); // overflow Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/UnsupportedCharsetExceptionTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/UnsupportedCharsetExceptionTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/UnsupportedCharsetExceptionTest.java (working copy) @@ -30,22 +30,22 @@ "impossible"); assertTrue(ex instanceof IllegalArgumentException); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), "impossible"); + assertEquals("impossible", ex.getCharsetName()); assertTrue(ex.getMessage().indexOf("impossible") != -1); ex = new UnsupportedCharsetException("ascii"); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), "ascii"); + assertEquals("ascii", ex.getCharsetName()); assertTrue(ex.getMessage().indexOf("ascii") != -1); ex = new UnsupportedCharsetException(""); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), ""); + assertEquals("", ex.getCharsetName()); ex.getMessage(); ex = new UnsupportedCharsetException(null); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), null); + assertNull(null, ex.getCharsetName()); assertTrue(ex.getMessage().indexOf("null") != -1); } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CoderResultTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CoderResultTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CoderResultTest.java (working copy) @@ -162,8 +162,8 @@ // expected } - assertEquals(CoderResult.malformedForLength(1).length(), 1); - assertEquals(CoderResult.unmappableForLength(1).length(), 1); + assertEquals(1, CoderResult.malformedForLength(1).length()); + assertEquals(1, CoderResult.unmappableForLength(1).length()); } /** @@ -239,13 +239,13 @@ CoderResult.malformedForLength(1).throwException(); fail("Should throw MalformedInputException"); } catch (MalformedInputException ex) { - assertEquals(ex.getInputLength(), 1); + assertEquals(1, ex.getInputLength()); } try { CoderResult.unmappableForLength(1).throwException(); fail("Should throw UnmappableCharacterException"); } catch (UnmappableCharacterException ex) { - assertEquals(ex.getInputLength(), 1); + assertEquals(1, ex.getInputLength()); } } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/IllegalCharsetNameExceptionTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/IllegalCharsetNameExceptionTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/IllegalCharsetNameExceptionTest.java (working copy) @@ -30,22 +30,22 @@ "impossible"); assertTrue(ex instanceof IllegalArgumentException); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), "impossible"); + assertEquals("impossible", ex.getCharsetName()); assertTrue(ex.getMessage().indexOf("impossible") != -1); ex = new IllegalCharsetNameException("ascii"); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), "ascii"); + assertEquals("ascii", ex.getCharsetName()); assertTrue(ex.getMessage().indexOf("ascii") != -1); ex = new IllegalCharsetNameException(""); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), ""); + assertEquals("", ex.getCharsetName()); ex.getMessage(); ex = new IllegalCharsetNameException(null); assertNull(ex.getCause()); - assertEquals(ex.getCharsetName(), null); + assertNull(ex.getCharsetName()); assertTrue(ex.getMessage().indexOf("null") != -1); } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/UnmappableCharacterExceptionTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/UnmappableCharacterExceptionTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/UnmappableCharacterExceptionTest.java (working copy) @@ -30,17 +30,17 @@ UnmappableCharacterException ex = new UnmappableCharacterException(3); assertTrue(ex instanceof CharacterCodingException); assertNull(ex.getCause()); - assertEquals(ex.getInputLength(), 3); + assertEquals(3, ex.getInputLength()); assertTrue(ex.getMessage().indexOf("3") != -1); ex = new UnmappableCharacterException(-3); assertNull(ex.getCause()); - assertEquals(ex.getInputLength(), -3); + assertEquals(-3, ex.getInputLength()); assertTrue(ex.getMessage().indexOf("-3") != -1); ex = new UnmappableCharacterException(0); assertNull(ex.getCause()); - assertEquals(ex.getInputLength(), 0); + assertEquals(0, ex.getInputLength()); assertTrue(ex.getMessage().indexOf("0") != -1); } Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java (working copy) @@ -544,13 +544,13 @@ // empty input buffer ByteBuffer out = encoder.encode(CharBuffer.wrap("")); - assertEquals(out.position(), 0); + assertEquals(0, out.position()); assertByteArray(out, new byte[0]); // assertByteArray(out, surrogate); // normal case out = encoder.encode(CharBuffer.wrap(unistr)); - assertEquals(out.position(), 0); + assertEquals(0, out.position()); assertByteArray(out, addSurrogate(unibytes)); } @@ -683,10 +683,10 @@ in.rewind(); out.rewind(); assertSame(CoderResult.UNDERFLOW, encoder.encode(in, out, true)); - assertEquals(out.limit(), 200); + assertEquals(200, out.limit()); assertTrue(out.position() > 0); assertTrue(out.remaining() > 0); - assertEquals(out.capacity(), 200); + assertEquals(200, out.capacity()); assertByteArray(out, addSurrogate(unibytes)); in.rewind(); @@ -698,20 +698,20 @@ in.rewind(); out = ByteBuffer.allocate(200); assertSame(CoderResult.UNDERFLOW, encoder.encode(in, out, false)); - assertEquals(out.limit(), 200); + assertEquals(200, out.limit()); assertTrue(out.position() > 0); assertTrue(out.remaining() > 0); - assertEquals(out.capacity(), 200); + assertEquals(200, out.capacity()); assertByteArray(out, addSurrogate(unibytes)); in.rewind(); assertSame(CoderResult.UNDERFLOW, encoder.encode(in, out, false)); in.rewind(); assertSame(CoderResult.UNDERFLOW, encoder.encode(in, out, true)); - assertEquals(out.limit(), 200); + assertEquals(200, out.limit()); assertTrue(out.position() > 0); assertTrue(out.remaining() > 0); - assertEquals(out.capacity(), 200); + assertEquals(200, out.capacity()); assertByteArray(out, addSurrogate(duplicateByteArray(unibytes, 3))); @@ -721,38 +721,38 @@ in.rewind(); out.rewind(); assertSame(CoderResult.OVERFLOW, encoder.encode(in, out, true)); - assertEquals(out.limit(), 4); - assertEquals(out.position(), 4); - assertEquals(out.remaining(), 0); - assertEquals(out.capacity(), 4); + assertEquals(4, out.limit()); + assertEquals(4, out.position()); + assertEquals(0, out.remaining()); + assertEquals(4, out.capacity()); ByteBuffer temp = ByteBuffer.allocate(200); out.flip(); temp.put(out); out = temp; assertSame(CoderResult.UNDERFLOW, encoder.encode(in, out, true)); - assertEquals(out.limit(), 200); + assertEquals(200, out.limit()); assertTrue(out.position() > 0); assertTrue(out.remaining() > 0); - assertEquals(out.capacity(), 200); + assertEquals(200, out.capacity()); assertByteArray(out, addSurrogate(unibytes)); assertSame(encoder, encoder.reset()); in.rewind(); out = ByteBuffer.allocate(4); assertSame(CoderResult.OVERFLOW, encoder.encode(in, out, false)); - assertEquals(out.limit(), 4); - assertEquals(out.position(), 4); - assertEquals(out.remaining(), 0); - assertEquals(out.capacity(), 4); + assertEquals(4, out.limit()); + assertEquals(4, out.position()); + assertEquals(0, out.remaining()); + assertEquals(4, out.capacity()); temp = ByteBuffer.allocate(200); out.flip(); temp.put(out); out = temp; assertSame(CoderResult.UNDERFLOW, encoder.encode(in, out, false)); - assertEquals(out.limit(), 200); + assertEquals(200, out.limit()); assertTrue(out.position() > 0); assertTrue(out.remaining() > 0); - assertEquals(out.capacity(), 200); + assertEquals(200, out.capacity()); assertByteArray(out, addSurrogate(unibytes)); } @@ -875,7 +875,7 @@ public void testFlush() throws CharacterCodingException { ByteBuffer out = ByteBuffer.allocate(6); CharBuffer in = CharBuffer.wrap("aaa"); - assertEquals(in.remaining(), 3); + assertEquals(3, in.remaining()); // by encode facade, so that internal state will be wrong encoder.encode(CharBuffer.wrap("testFlush"), ByteBuffer.allocate(20), Index: modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java =================================================================== --- modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java (revision 394268) +++ modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java (working copy) @@ -71,15 +71,15 @@ assertTrue(Charset.isSupported("UTF-16LE")); Charset c1 = Charset.forName("US-ASCII"); - assertEquals(Charset.forName("US-ASCII").name(), "US-ASCII"); - assertEquals(Charset.forName("ASCII").name(), "US-ASCII"); - assertEquals(Charset.forName("ISO-8859-1").name(), "ISO-8859-1"); - assertEquals(Charset.forName("ISO8859_1").name(), "ISO-8859-1"); - assertEquals(Charset.forName("UTF-8").name(), "UTF-8"); - assertEquals(Charset.forName("UTF8").name(), "UTF-8"); - assertEquals(Charset.forName("UTF-16").name(), "UTF-16"); - assertEquals(Charset.forName("UTF-16BE").name(), "UTF-16BE"); - assertEquals(Charset.forName("UTF-16LE").name(), "UTF-16LE"); + assertEquals("US-ASCII", Charset.forName("US-ASCII").name()); + assertEquals("US-ASCII", Charset.forName("ASCII").name()); + assertEquals("ISO-8859-1", Charset.forName("ISO-8859-1").name()); + assertEquals("ISO-8859-1", Charset.forName("ISO8859_1").name()); + assertEquals("UTF-8", Charset.forName("UTF-8").name()); + assertEquals("UTF-8", Charset.forName("UTF8").name()); + assertEquals("UTF-16", Charset.forName("UTF-16").name()); + assertEquals("UTF-16BE", Charset.forName("UTF-16BE").name()); + assertEquals("UTF-16LE", Charset.forName("UTF-16LE").name()); assertNotSame(Charset.availableCharsets(), Charset.availableCharsets()); // assertSame(Charset.forName("US-ASCII"), Charset.availableCharsets() @@ -214,11 +214,11 @@ public void testConstructor_Normal() { final String mockName = "mockChar1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:-_"; MockCharset c = new MockCharset(mockName, new String[] { "mock" }); - assertEquals(c.name(), mockName); - assertEquals(c.displayName(), mockName); - assertEquals(c.displayName(Locale.getDefault()), mockName); - assertEquals(c.aliases().toArray()[0], "mock"); - assertEquals(c.aliases().toArray().length, 1); + assertEquals(mockName, c.name()); + assertEquals(mockName, c.displayName()); + assertEquals(mockName, c.displayName(Locale.getDefault())); + assertEquals("mock", c.aliases().toArray()[0]); + assertEquals(1, c.aliases().toArray().length); } /* @@ -280,18 +280,18 @@ /* * Test the constructor with null aliases. */ - public void testConstructor_NullAliases() { + public void testConstructor_NullAliase() { MockCharset c = new MockCharset("mockChar", null); - assertEquals(c.name(), "mockChar"); - assertEquals(c.displayName(), "mockChar"); - assertEquals(c.displayName(Locale.getDefault()), "mockChar"); - assertEquals(c.aliases().toArray().length, 0); + assertEquals("mockChar", c.name()); + assertEquals("mockChar", c.displayName()); + assertEquals("mockChar", c.displayName(Locale.getDefault())); + assertEquals(0, c.aliases().toArray().length); } /* * Test the constructor with a null aliases. */ - public void testConstructor_NullAliase() { + public void testConstructor_NullAliases() { try { new MockCharset("mockChar", new String[] { "mock", null }); fail("Should throw NullPointerException!"); @@ -305,10 +305,10 @@ */ public void testConstructor_NoAliases() { MockCharset c = new MockCharset("mockChar", new String[0]); - assertEquals(c.name(), "mockChar"); - assertEquals(c.displayName(), "mockChar"); - assertEquals(c.displayName(Locale.getDefault()), "mockChar"); - assertEquals(c.aliases().toArray().length, 0); + assertEquals("mockChar", c.name()); + assertEquals("mockChar", c.displayName()); + assertEquals("mockChar", c.displayName(Locale.getDefault())); + assertEquals(0, c.aliases().toArray().length); } /* @@ -363,7 +363,7 @@ final String mockName = "mockChar1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:-_"; MockCharset c = new MockCharset("mockChar", new String[] { "mock", mockName, "mock2" }); - assertEquals(c.name(), "mockChar"); + assertEquals("mockChar", c.name()); assertEquals(3, c.aliases().size()); assertTrue(c.aliases().contains("mock")); assertTrue(c.aliases().contains(mockName)); @@ -385,7 +385,7 @@ final String mockName = "mockChar1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:-_"; MockCharset c = new MockCharset("mockChar", new String[] { "mockChar", "mock", mockName, "mock", "mockChar", "mock", "mock2" }); - assertEquals(c.name(), "mockChar"); + assertEquals("mockChar", c.name()); assertEquals(4, c.aliases().size()); assertTrue(c.aliases().contains("mockChar")); assertTrue(c.aliases().contains("mock")); @@ -562,9 +562,9 @@ public void testEncode_CharBuffer_Normal() throws Exception { MockCharset c1 = new MockCharset("mock", null); ByteBuffer bb = c1.encode(CharBuffer.wrap("abcdefg")); - assertEquals(new String(bb.array(), "iso8859-1"), "abcdefg"); + assertEquals("abcdefg", new String(bb.array(), "iso8859-1")); bb = c1.encode(CharBuffer.wrap("")); - assertEquals(new String(bb.array(), "iso8859-1"), ""); + assertEquals("", new String(bb.array(), "iso8859-1")); } /* @@ -610,9 +610,9 @@ public void testEncode_String_Normal() throws Exception { MockCharset c1 = new MockCharset("mock", null); ByteBuffer bb = c1.encode("abcdefg"); - assertEquals(new String(bb.array(), "iso8859-1"), "abcdefg"); + assertEquals("abcdefg", new String(bb.array(), "iso8859-1")); bb = c1.encode(""); - assertEquals(new String(bb.array(), "iso8859-1"), ""); + assertEquals("", new String(bb.array(), "iso8859-1")); } /* @@ -660,9 +660,9 @@ MockCharset c1 = new MockCharset("mock", null); CharBuffer cb = c1.decode(ByteBuffer.wrap("abcdefg" .getBytes("iso8859-1"))); - assertEquals(new String(cb.array()), "abcdefg"); + assertEquals("abcdefg", new String(cb.array())); cb = c1.decode(ByteBuffer.wrap("".getBytes("iso8859-1"))); - assertEquals(new String(cb.array()), ""); + assertEquals("", new String(cb.array())); } /* Index: modules/jndi/src/test/java/tests/api/javax/naming/ldap/TestControlFactory.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/ldap/TestControlFactory.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/ldap/TestControlFactory.java (working copy) @@ -114,7 +114,7 @@ Control newControl = ControlFactory.getControlInstance(null, context, new Hashtable()); - assertEquals(null, newControl); + assertNull(newControl); assertSame(null, newControl); } Index: modules/jndi/src/test/java/tests/api/javax/naming/ldap/TestUnsolicitedNotificationEvent.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/ldap/TestUnsolicitedNotificationEvent.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/ldap/TestUnsolicitedNotificationEvent.java (working copy) @@ -74,7 +74,7 @@ src, null); assertEquals(src, event.getSource()); - assertEquals(null, event.getNotification()); + assertNull(event.getNotification()); } public void testDispatch() { Index: modules/jndi/src/test/java/tests/api/javax/naming/spi/TestNamingManagerExplore.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/spi/TestNamingManagerExplore.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/spi/TestNamingManagerExplore.java (working copy) @@ -61,7 +61,7 @@ String obj = "String object"; context.bind(name, obj); - assertEquals(InvokeRecord.getLatestUrlSchema(), null); + assertNull(InvokeRecord.getLatestUrlSchema()); } public void testFactoryBuilder_name() throws IllegalStateException, @@ -90,7 +90,7 @@ String obj = "Name object"; context.bind(name, obj); - assertEquals(InvokeRecord.getLatestUrlSchema(), null); + assertNull(InvokeRecord.getLatestUrlSchema()); } class MyInitialContext extends InitialContext { Index: modules/jndi/src/test/java/tests/api/javax/naming/TestBinaryRefAddr.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/TestBinaryRefAddr.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/TestBinaryRefAddr.java (working copy) @@ -57,12 +57,12 @@ // Test normal condition BinaryRefAddr addr = new BinaryRefAddr("binary", ab); - TestCase.assertNotNull(addr); - TestCase.assertEquals("binary", addr.getType()); + assertNotNull(addr); + assertEquals("binary", addr.getType()); ab2 = (byte[]) addr.getContent(); - TestCase.assertEquals(ab.length, ab2.length); + assertEquals(ab.length, ab2.length); for (int i = ab2.length - 1; i >= 0; i--) { - TestCase.assertEquals(ab[i], ab2[i]); + assertEquals(ab[i], ab2[i]); } assertNotSame(ab, ab2); } @@ -73,12 +73,12 @@ // Test null "type" parameter BinaryRefAddr addr = new BinaryRefAddr(null, ab); - TestCase.assertNotNull(addr); - TestCase.assertNull(addr.getType()); + assertNotNull(addr); + assertNull(addr.getType()); ab2 = (byte[]) addr.getContent(); - TestCase.assertEquals(ab.length, ab2.length); + assertEquals(ab.length, ab2.length); for (int i = ab2.length - 1; i >= 0; i--) { - TestCase.assertEquals(ab[i], ab2[i]); + assertEquals(ab[i], ab2[i]); } } @@ -91,7 +91,7 @@ fail("Should throw NullPointerException here."); } catch (NullPointerException e) { } - TestCase.assertNull(addr); + assertNull(addr); } public void testBinaryRefAddr_ComplexNormal() { @@ -100,12 +100,12 @@ // Test normal condition BinaryRefAddr addr = new BinaryRefAddr("binary", ab, 1, 1); - TestCase.assertNotNull(addr); - TestCase.assertEquals("binary", addr.getType()); + assertNotNull(addr); + assertEquals("binary", addr.getType()); ab2 = (byte[]) addr.getContent(); - TestCase.assertEquals(ab2.length, 1); + assertEquals(1, ab2.length); for (int i = ab2.length - 1; i >= 0; i--) { - TestCase.assertEquals(ab[i + 1], ab2[i]); + assertEquals(ab[i + 1], ab2[i]); } assertNotSame(ab, ab2); } @@ -116,12 +116,12 @@ // Test null "type" parameter BinaryRefAddr addr = new BinaryRefAddr(null, ab, 1, 1); - TestCase.assertNotNull(addr); - TestCase.assertNull(addr.getType()); + assertNotNull(addr); + assertNull(addr.getType()); ab2 = (byte[]) addr.getContent(); - TestCase.assertEquals(ab2.length, 1); + assertEquals(1, ab2.length); for (int i = ab2.length - 1; i >= 0; i--) { - TestCase.assertEquals(ab[i + 1], ab2[i]); + assertEquals(ab[i + 1], ab2[i]); } } @@ -134,7 +134,7 @@ fail("Should throw NullPointerException here."); } catch (NullPointerException e) { } - TestCase.assertNull(addr); + assertNull(addr); } public void testBinaryRefAddr_TooSmallIndex() { @@ -146,7 +146,7 @@ fail("Should throw ArrayIndexOutOfBoundsException here."); } catch (ArrayIndexOutOfBoundsException e) { } - TestCase.assertNull(addr); + assertNull(addr); } public void testBinaryRefAddr_TooBigIndex() { @@ -158,7 +158,7 @@ fail("Should throw ArrayIndexOutOfBoundsException here."); } catch (ArrayIndexOutOfBoundsException e) { } - TestCase.assertNull(addr); + assertNull(addr); } public void testBinaryRefAddr_ComplexZeroSize() { @@ -168,8 +168,8 @@ // Test zero size addr = new BinaryRefAddr("binary", new byte[] { 2, 3 }, 0, 0); ab = (byte[]) addr.getContent(); - TestCase.assertEquals(ab.length, 0); - TestCase.assertNotNull(addr); + assertEquals(0, ab.length); + assertNotNull(addr); } public void testBinaryRefAddr_TooSmallSize() { @@ -181,7 +181,7 @@ fail("Should throw NegativeArraySizeException here."); } catch (NegativeArraySizeException e) { } - TestCase.assertNull(addr); + assertNull(addr); } public void testBinaryRefAddr_TooBigSize() { @@ -193,14 +193,14 @@ fail("Should throw ArrayIndexOutOfBoundsException here."); } catch (ArrayIndexOutOfBoundsException e) { } - TestCase.assertNull(addr); + assertNull(addr); } public void testGetType() { // Test empty type BinaryRefAddr addr = new BinaryRefAddr("", new byte[] { 1 }); - TestCase.assertEquals("", addr.getType()); + assertEquals("", addr.getType()); // Other conditions are tested in testBinaryRefAddr_XXX } Index: modules/jndi/src/test/java/tests/api/javax/naming/directory/TestSearchResult.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/directory/TestSearchResult.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/directory/TestSearchResult.java (working copy) @@ -126,7 +126,7 @@ SearchResult r; r = new SearchResult("name", "obj", null); - assertEquals(null, r.getAttributes()); + assertNull(r.getAttributes()); r.setAttributes(attrs); assertEquals(attrs, r.getAttributes()); } Index: modules/jndi/src/test/java/tests/api/javax/naming/directory/TestSearchControls.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/directory/TestSearchControls.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/directory/TestSearchControls.java (working copy) @@ -59,7 +59,7 @@ assertEquals(SearchControls.ONELEVEL_SCOPE, ctrl.getSearchScope()); assertEquals(0, ctrl.getCountLimit()); assertEquals(0, ctrl.getTimeLimit()); - assertEquals(null, ctrl.getReturningAttributes()); + assertNull(ctrl.getReturningAttributes()); assertEquals(false, ctrl.getDerefLinkFlag()); assertEquals(false, ctrl.getReturningObjFlag()); } Index: modules/jndi/src/test/java/tests/api/javax/naming/TestCompositeName.java =================================================================== --- modules/jndi/src/test/java/tests/api/javax/naming/TestCompositeName.java (revision 394268) +++ modules/jndi/src/test/java/tests/api/javax/naming/TestCompositeName.java (working copy) @@ -299,7 +299,7 @@ name.add(null); assertEquals(name.size(), oldSize + 2); try { - assertEquals(null, name.getSuffix(4).toString()); + assertNull(name.getSuffix(4).toString()); fail(); } catch (NullPointerException e) { } @@ -527,7 +527,7 @@ assertEquals(-1, name1.compareTo(name2)); assertEquals(1, name3.compareTo(name1)); assertEquals(-1, name1.compareTo(name4)); - assertEquals(name1.compareTo(name1), 0); + assertEquals(0, name1.compareTo(name1)); try { name1.compareTo(null); fail(); Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ByteOrderTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ByteOrderTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ByteOrderTest.java (working copy) @@ -30,8 +30,8 @@ } public void testToString() { - assertEquals(ByteOrder.BIG_ENDIAN.toString(), "BIG_ENDIAN"); - assertEquals(ByteOrder.LITTLE_ENDIAN.toString(), "LITTLE_ENDIAN"); + assertEquals("BIG_ENDIAN", ByteOrder.BIG_ENDIAN.toString()); + assertEquals("LITTLE_ENDIAN", ByteOrder.LITTLE_ENDIAN.toString()); } public void testNativeOrder() { Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/FloatBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/FloatBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/FloatBufferTest.java (working copy) @@ -157,11 +157,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(FloatBuffer buf) { @@ -197,7 +197,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 0.0f, buf.capacity()); try { @@ -214,7 +214,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 1.0f, 4); try { @@ -276,11 +276,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -363,7 +363,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -377,7 +377,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -390,7 +390,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); FloatBuffer ret = buf.get(array, 0, array.length); @@ -552,7 +552,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -566,7 +566,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -579,7 +579,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); FloatBuffer ret = buf.put(array, 0, array.length); @@ -643,7 +643,7 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); FloatBuffer ret = buf.put(i, (float) i); assertEquals(buf.get(i), (float) i, 0.0); assertSame(ret, buf); @@ -671,7 +671,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -800,9 +800,9 @@ } FloatBuffer buf = FloatBuffer.wrap(array, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 18); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(18, buf.limit()); + assertEquals(20, buf.capacity()); testFloatBufferInstanceThoroughly(buf); } @@ -846,4 +846,4 @@ testFloatBufferInstance(slice.slice()); } -} \ No newline at end of file +} Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/DoubleBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/DoubleBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/DoubleBufferTest.java (working copy) @@ -180,11 +180,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(DoubleBuffer buf) { @@ -220,7 +220,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 0.0, buf.capacity()); try { @@ -237,7 +237,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 1.0, 4); try { @@ -299,11 +299,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -386,7 +386,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -400,7 +400,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -413,7 +413,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); DoubleBuffer ret = buf.get(array, 0, array.length); @@ -575,7 +575,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -589,7 +589,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -602,7 +602,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); DoubleBuffer ret = buf.put(array, 0, array.length); @@ -666,7 +666,7 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); DoubleBuffer ret = buf.put(i, (double) i); assertEquals(buf.get(i), (double) i, 0.0); assertSame(ret, buf); @@ -694,7 +694,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -823,9 +823,9 @@ } DoubleBuffer buf = DoubleBuffer.wrap(array, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 18); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(18, buf.limit()); + assertEquals(20, buf.capacity()); testDoubleBufferInstanceThoroughly(buf); } Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/IntBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/IntBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/IntBufferTest.java (working copy) @@ -157,11 +157,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(IntBuffer buf) { @@ -197,7 +197,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 0, buf.capacity()); try { @@ -214,7 +214,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 1, 4); try { @@ -276,11 +276,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -363,7 +363,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -377,7 +377,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -390,7 +390,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); IntBuffer ret = buf.get(array, 0, array.length); @@ -516,10 +516,10 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), i); + assertEquals(i, buf.position()); array[0] = (int) i; IntBuffer ret = buf.put(array); - assertEquals(buf.get(i), (int) i); + assertEquals((int) i, buf.get(i)); assertSame(ret, buf); } try { @@ -552,7 +552,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -566,7 +566,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -579,7 +579,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); IntBuffer ret = buf.put(array, 0, array.length); @@ -643,7 +643,7 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); IntBuffer ret = buf.put(i, (int) i); assertEquals(buf.get(i), (int) i); assertSame(ret, buf); @@ -671,7 +671,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -686,7 +686,7 @@ loadTestData1(slice); assertContentLikeTestData1(buf, 1, 0, slice.capacity()); buf.put(2, 500); - assertEquals(slice.get(1), 500); + assertEquals(500, slice.get(1)); } } @@ -800,9 +800,9 @@ } IntBuffer buf = IntBuffer.wrap(array, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 18); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(18, buf.limit()); + assertEquals(20, buf.capacity()); testIntBufferInstanceThoroughly(buf); } Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/CharBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/CharBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/CharBufferTest.java (working copy) @@ -164,11 +164,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(CharBuffer buf) { @@ -204,7 +204,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, (char) 0, buf.capacity()); try { @@ -221,7 +221,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, (char) 1, 4); try { @@ -283,11 +283,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -370,7 +370,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -384,7 +384,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -397,7 +397,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); CharBuffer ret = buf.get(array, 0, array.length); @@ -559,7 +559,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -573,7 +573,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -586,7 +586,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); CharBuffer ret = buf.put(array, 0, array.length); @@ -650,7 +650,7 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); CharBuffer ret = buf.put(i, (char) i); assertEquals(buf.get(i), (char) i); assertSame(ret, buf); @@ -678,7 +678,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -693,7 +693,7 @@ loadTestData1(slice); assertContentLikeTestData1(buf, 1, (char) 0, slice.capacity()); buf.put(2, (char) 500); - assertEquals(slice.get(1), 500); + assertEquals(500, slice.get(1)); } } @@ -741,7 +741,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.subSequence(buf.length(), buf.length()).length(), 0); + assertEquals(0, buf.subSequence(buf.length(), buf.length()).length()); try { buf.subSequence(1, 0); fail("Should throw Exception"); //$NON-NLS-1$ @@ -812,7 +812,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); try { buf.put(str, -1, str.length()); @@ -827,7 +827,7 @@ // expected } buf.put(str, str.length(), str.length()); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(str, 2, 1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -840,7 +840,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); char array[] = new char[buf.capacity()]; loadTestData2(array, 0, array.length); @@ -954,9 +954,9 @@ } CharBuffer buf = CharBuffer.wrap(array, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 18); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(18, buf.limit()); + assertEquals(20, buf.capacity()); testCharBufferInstanceThoroughly(buf); } @@ -993,9 +993,9 @@ } CharBuffer buf = CharBuffer.wrap(str, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 16); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(16, buf.limit()); + assertEquals(20, buf.capacity()); testCharBufferInstanceThoroughly(buf); } Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/BufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/BufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/BufferTest.java (working copy) @@ -61,7 +61,7 @@ Buffer ret = buf.clear(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); try { buf.reset(); @@ -82,7 +82,7 @@ Buffer ret = buf.flip(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), oldPosition); try { buf.reset(); @@ -233,7 +233,7 @@ assertEquals(buf.position(), oldPosition); buf.position(0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.position(buf.limit()); assertEquals(buf.position(), buf.limit()); @@ -301,7 +301,7 @@ int oldLimit = buf.limit(); Buffer ret = buf.rewind(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertSame(ret, buf); try { buf.reset(); Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/LongBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/LongBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/LongBufferTest.java (working copy) @@ -157,11 +157,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(LongBuffer buf) { @@ -197,7 +197,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 0, buf.capacity()); try { @@ -214,7 +214,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, 1, 4); try { @@ -276,11 +276,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -363,7 +363,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -377,7 +377,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -390,7 +390,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); LongBuffer ret = buf.get(array, 0, array.length); @@ -552,7 +552,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -566,7 +566,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -579,7 +579,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); LongBuffer ret = buf.put(array, 0, array.length); @@ -643,7 +643,7 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); LongBuffer ret = buf.put(i, (long) i); assertEquals(buf.get(i), (long) i); assertSame(ret, buf); @@ -671,7 +671,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -686,7 +686,7 @@ loadTestData1(slice); assertContentLikeTestData1(buf, 1, 0, slice.capacity()); buf.put(2, 500); - assertEquals(slice.get(1), 500); + assertEquals(500, slice.get(1)); } } @@ -800,9 +800,9 @@ } LongBuffer buf = LongBuffer.wrap(array, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 18); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(18, buf.limit()); + assertEquals(20, buf.capacity()); testLongBufferInstanceThoroughly(buf); } Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ShortBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ShortBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ShortBufferTest.java (working copy) @@ -157,11 +157,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(ShortBuffer buf) { @@ -197,7 +197,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, (short) 0, buf.capacity()); try { @@ -214,7 +214,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, (short) 1, 4); try { @@ -276,11 +276,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -363,7 +363,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -377,7 +377,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -390,7 +390,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); ShortBuffer ret = buf.get(array, 0, array.length); @@ -405,7 +405,7 @@ public static void testGetint(ShortBuffer buf) { buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), i); + assertEquals(i, buf.position()); assertEquals(buf.get(), buf.get(i)); } try { @@ -552,7 +552,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -566,7 +566,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -579,7 +579,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); ShortBuffer ret = buf.put(array, 0, array.length); @@ -643,9 +643,9 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); ShortBuffer ret = buf.put(i, (short) i); - assertEquals(buf.get(i), (short) i); + assertEquals((short) i, buf.get(i)); assertSame(ret, buf); } try { @@ -671,7 +671,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -686,7 +686,7 @@ loadTestData1(slice); assertContentLikeTestData1(buf, 1, (short) 0, slice.capacity()); buf.put(2, (short) 500); - assertEquals(slice.get(1), 500); + assertEquals(500, slice.get(1)); } } @@ -800,9 +800,9 @@ } ShortBuffer buf = ShortBuffer.wrap(array, 2, 16); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 18); - assertEquals(buf.capacity(), 20); + assertEquals(2, buf.position()); + assertEquals(18, buf.limit()); + assertEquals(20, buf.capacity()); testShortBufferInstanceThoroughly(buf); } Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java (working copy) @@ -403,20 +403,20 @@ assertFalse(s.isOutputShutdown()); assertNull(s.getInetAddress()); - assertEquals(s.getLocalAddress().getHostAddress(), "0.0.0.0"); + assertEquals("0.0.0.0", s.getLocalAddress().getHostAddress()); // FIXME ?? -1 means not yet bound. this maybe a bug of RI // RI can't pass this, it returns 0. - // assertEquals(s.getLocalPort(), -1); + // assertEquals(-1, s.getLocalPort()); assertNull(s.getLocalSocketAddress()); // not connected - assertEquals(s.getPort(), 0); + assertEquals(0, s.getPort()); assertTrue(s.getReceiveBufferSize() >= 8192); assertNull(s.getRemoteSocketAddress()); // assertFalse(s.getReuseAddress()); assertTrue(s.getSendBufferSize() >= 8192); - assertEquals(s.getSoTimeout(), 0); - assertEquals(s.getTrafficClass(), 0); + assertEquals(0, s.getSoTimeout()); + assertEquals(0, s.getTrafficClass()); } @@ -439,17 +439,17 @@ assertSame(s.getInetAddress(), address.getAddress()); - assertEquals(s.getLocalAddress(), this.localAddr1.getAddress()); - assertEquals(s.getPort(), address.getPort()); + assertEquals(this.localAddr1.getAddress(), s.getLocalAddress()); + assertEquals(address.getPort(), s.getPort()); assertNotNull(s.getLocalSocketAddress()); assertTrue(s.getReceiveBufferSize() >= 8192); // equal , not same - assertNotSame(s.getRemoteSocketAddress(), (SocketAddress) address); - assertEquals(s.getRemoteSocketAddress(), (SocketAddress) address); + assertNotSame((SocketAddress) address, s.getRemoteSocketAddress()); + assertEquals((SocketAddress) address, s.getRemoteSocketAddress()); // assertFalse(s.getReuseAddress()); assertTrue(s.getSendBufferSize() >= 8192); - assertEquals(s.getSoTimeout(), 0); - assertEquals(s.getTrafficClass(), 0); + assertEquals(0, s.getSoTimeout()); + assertEquals(0, s.getTrafficClass()); } private void assertSocketAction_Block_BeforeConnect(Socket s) @@ -511,7 +511,7 @@ private void assertSocketAction_Block_AfterConnect(Socket s) throws IOException { - assertEquals(s.getPort(), localAddr1.getPort()); + assertEquals(localAddr1.getPort(), s.getPort()); assertTrue(this.channel1.isConnected()); assertTrue(s.isConnected()); try { @@ -535,7 +535,7 @@ private void assertSocketAction_NonBlock_AfterConnect(Socket s) throws IOException { - assertEquals(s.getPort(), localAddr1.getPort()); + assertEquals(localAddr1.getPort(), s.getPort()); assertTrue(this.channel1.isConnected()); assertTrue(s.isConnected()); @@ -737,7 +737,7 @@ this.channel1.close(); } catch (ConnectException e) { - assertEquals(e.getMessage(), "Connection refused"); + assertEquals("Connection refused", e.getMessage()); } statusChannelClosed(); } @@ -760,7 +760,7 @@ statusNotConnected_Pending(); this.channel1.close(); } catch (ConnectException e) { - assertEquals(e.getMessage(), "Connection refused"); + assertEquals("Connection refused", e.getMessage()); } statusChannelClosed(); } @@ -838,7 +838,7 @@ assertFalse(this.channel1.finishConnect()); statusNotConnected_Pending(); } catch (ConnectException e) { - assertEquals(e.getMessage(), "Connection refused"); + assertEquals("Connection refused", e.getMessage()); } if (this.channel1.isOpen()) { @@ -1012,7 +1012,7 @@ statusNotConnected_Pending(); this.channel1.close(); } catch (ConnectException e) { - assertEquals(e.getMessage(), "Connection refused"); + assertEquals("Connection refused", e.getMessage()); } statusChannelClosed(); } @@ -1168,7 +1168,7 @@ statusNotConnected_Pending(); this.channel1.close(); } catch (ConnectException e) { - assertEquals(e.getMessage(), "Connection refused"); + assertEquals("Connection refused", e.getMessage()); } statusChannelClosed(); @@ -1387,7 +1387,7 @@ assertFalse(this.channel1.finishConnect()); statusNotConnected_Pending(); } catch (ConnectException e) { - assertEquals(e.getMessage(), "Connection refused"); + assertEquals("Connection refused", e.getMessage()); } } @@ -2008,7 +2008,7 @@ assertTrue(this.server1.isBound()); java.nio.ByteBuffer writeBuf = java.nio.ByteBuffer.allocate(0); this.channel1.connect(localAddr1); - assertEquals(this.channel1.write(writeBuf), 0); + assertEquals(0, this.channel1.write(writeBuf)); try { this.channel1.write((java.nio.ByteBuffer) null); fail("Should throw NPE"); Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java (working copy) @@ -419,16 +419,16 @@ assertFalse(s.getBroadcast()); assertFalse(s.getReuseAddress()); assertNull(s.getInetAddress()); - assertEquals(s.getLocalAddress().getHostAddress(), "0.0.0.0"); - assertEquals(s.getLocalPort(), 0); + assertEquals("0.0.0.0", s.getLocalAddress().getHostAddress()); + assertEquals(0, s.getLocalPort()); assertNull(s.getLocalSocketAddress()); - assertEquals(s.getPort(), -1); + assertEquals(-1, s.getPort()); assertTrue(s.getReceiveBufferSize() >= 8192); assertNull(s.getRemoteSocketAddress()); assertFalse(s.getReuseAddress()); assertTrue(s.getSendBufferSize() >= 8192); - assertEquals(s.getSoTimeout(), 0); - assertEquals(s.getTrafficClass(), 0); + assertEquals(0, s.getSoTimeout()); + assertEquals(0, s.getTrafficClass()); } private void assertSocketAfterConnect(DatagramSocket s) @@ -438,18 +438,18 @@ assertTrue(s.isConnected()); assertFalse(s.getBroadcast()); assertFalse(s.getReuseAddress()); - assertSame(s.getInetAddress(), localAddr1.getAddress()); - assertEquals(s.getLocalAddress(), localAddr1.getAddress()); + assertSame(localAddr1.getAddress(), s.getInetAddress()); + assertEquals(localAddr1.getAddress(), s.getLocalAddress()); assertNotNull(s.getLocalSocketAddress()); - assertEquals(s.getPort(), localAddr1.getPort()); + assertEquals(localAddr1.getPort(), s.getPort()); assertTrue(s.getReceiveBufferSize() >= 8192); // not same , but equals - assertNotSame(s.getRemoteSocketAddress(), (SocketAddress) localAddr1); - assertEquals(s.getRemoteSocketAddress(), (SocketAddress) localAddr1); + assertNotSame((SocketAddress) localAddr1, s.getRemoteSocketAddress()); + assertEquals((SocketAddress) localAddr1, s.getRemoteSocketAddress()); assertFalse(s.getReuseAddress()); assertTrue(s.getSendBufferSize() >= 8192); - assertEquals(s.getSoTimeout(), 0); - assertEquals(s.getTrafficClass(), 0); + assertEquals(0, s.getSoTimeout()); + assertEquals(0, s.getTrafficClass()); } private void assertSocketActionBeforeConnect(DatagramSocket s) Index: modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ByteBufferTest.java =================================================================== --- modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ByteBufferTest.java (revision 394268) +++ modules/nio/src/test/java/org/apache/harmony/tests/java/nio/ByteBufferTest.java (working copy) @@ -195,11 +195,11 @@ // readonly's position, mark, and limit should be independent to buf readonly.reset(); - assertEquals(readonly.position(), 0); + assertEquals(0, readonly.position()); readonly.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); } public static void testCompact(ByteBuffer buf) { @@ -235,7 +235,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, (byte) 0, buf.capacity()); try { @@ -252,7 +252,7 @@ buf.mark(); ret = buf.compact(); assertSame(ret, buf); - assertEquals(buf.position(), 4); + assertEquals(4, buf.position()); assertEquals(buf.limit(), buf.capacity()); assertContentLikeTestData1(buf, 0, (byte) 1, 4); try { @@ -314,11 +314,11 @@ // duplicate's position, mark, and limit should be independent to buf duplicate.reset(); - assertEquals(duplicate.position(), 0); + assertEquals(0, duplicate.position()); duplicate.clear(); assertEquals(buf.position(), buf.limit()); buf.reset(); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); // duplicate share the same content with buf if (!duplicate.isReadOnly()) { @@ -357,7 +357,7 @@ public static void testGet(ByteBuffer buf) { buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), i); + assertEquals(i, buf.position()); assertEquals(buf.get(), buf.get(i)); } try { @@ -375,7 +375,7 @@ byte array[] = new byte[1]; buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), i); + assertEquals(i, buf.position()); ByteBuffer ret = buf.get(array); assertEquals(array[0], buf.get(i)); assertSame(ret, buf); @@ -401,7 +401,7 @@ } catch (BufferUnderflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -415,7 +415,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.get(array, 2, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -428,7 +428,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); buf.clear(); ByteBuffer ret = buf.get(array, 0, array.length); @@ -443,7 +443,7 @@ public static void testGetint(ByteBuffer buf) { buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), i); + assertEquals(i, buf.position()); assertEquals(buf.get(), buf.get(i)); } try { @@ -522,9 +522,9 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), i); + assertEquals(i, buf.position()); ByteBuffer ret = buf.put((byte) i); - assertEquals(buf.get(i), (byte) i); + assertEquals((byte) i, buf.get(i)); assertSame(ret, buf); } try { @@ -588,7 +588,7 @@ } catch (BufferOverflowException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, -1, array.length); fail("Should throw Exception"); //$NON-NLS-1$ @@ -602,7 +602,7 @@ // expected } buf.put(array, array.length, 0); - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); try { buf.put(array, 0, -1); fail("Should throw Exception"); //$NON-NLS-1$ @@ -615,7 +615,7 @@ } catch (IndexOutOfBoundsException e) { // expected } - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); loadTestData2(array, 0, array.length); ByteBuffer ret = buf.put(array, 0, array.length); @@ -679,7 +679,7 @@ buf.clear(); for (int i = 0; i < buf.capacity(); i++) { - assertEquals(buf.position(), 0); + assertEquals(0, buf.position()); ByteBuffer ret = buf.put(i, (byte) i); assertEquals(buf.get(i), (byte) i); assertSame(ret, buf); @@ -707,7 +707,7 @@ assertEquals(buf.isReadOnly(), slice.isReadOnly()); assertEquals(buf.isDirect(), slice.isDirect()); assertEquals(buf.order(), slice.order()); - assertEquals(slice.position(), 0); + assertEquals(0, slice.position()); assertEquals(slice.limit(), buf.remaining()); assertEquals(slice.capacity(), buf.remaining()); try { @@ -722,7 +722,7 @@ loadTestData1(slice); assertContentLikeTestData1(buf, 1, (byte) 0, slice.capacity()); buf.put(2, (byte) 100); - assertEquals(slice.get(1), 100); + assertEquals(100, slice.get(1)); } } @@ -2187,9 +2187,9 @@ } ByteBuffer buf = ByteBuffer.wrap(array, 2, 240); - assertEquals(buf.position(), 2); - assertEquals(buf.limit(), 242); - assertEquals(buf.capacity(), 250); + assertEquals(2, buf.position()); + assertEquals(242, buf.limit()); + assertEquals(250, buf.capacity()); testByteBufferInstanceThoroughly(buf); } Index: modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java (working copy) @@ -129,15 +129,17 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.ConsoleHandler.level"), "FINE"); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.ConsoleHandler.encoding"), "iso-8859-1"); + assertEquals("FINE", + LogManager.getLogManager().getProperty( + "java.util.logging.ConsoleHandler.level")); + assertEquals("iso-8859-1", + LogManager.getLogManager().getProperty( + "java.util.logging.ConsoleHandler.encoding")); ConsoleHandler h = new ConsoleHandler(); assertSame(h.getLevel(), Level.parse("FINE")); assertTrue(h.getFormatter() instanceof MockFormatter); assertTrue(h.getFilter() instanceof MockFilter); - assertEquals(h.getEncoding(), "iso-8859-1"); + assertEquals("iso-8859-1", h.getEncoding()); } /* @@ -153,17 +155,19 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.ConsoleHandler.level"), INVALID_LEVEL); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.ConsoleHandler.encoding"), "XXXX"); + assertEquals(INVALID_LEVEL, + LogManager.getLogManager().getProperty( + "java.util.logging.ConsoleHandler.level")); + assertEquals("XXXX", + LogManager.getLogManager().getProperty( + "java.util.logging.ConsoleHandler.encoding")); ConsoleHandler h = new ConsoleHandler(); assertSame(h.getLevel(), Level.INFO); assertTrue(h.getFormatter() instanceof SimpleFormatter); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); h.publish(new LogRecord(Level.SEVERE, "test")); - assertEquals(h.getEncoding(), null); + assertNull(h.getEncoding()); } /* Index: modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java (working copy) @@ -135,13 +135,13 @@ Formatter formatter = handler.getFormatter(); writer.getBuffer().setLength(0); handler.close(); - assertEquals(writer.toString(), "close"); - assertEquals(handler.getFilter(), filter); - assertEquals(handler.getFormatter(), formatter); + assertEquals("close", writer.toString()); + assertEquals(filter, handler.getFilter()); + assertEquals(formatter, handler.getFormatter()); assertNull(handler.getEncoding()); assertNotNull(handler.getErrorManager()); - assertEquals(handler.getLevel(), Level.OFF); - assertEquals(handler.getPushLevel(), Level.WARNING); + assertEquals(Level.OFF, handler.getLevel()); + assertEquals(Level.WARNING, handler.getPushLevel()); assertFalse(handler.isLoggable(new LogRecord(Level.SEVERE, "test"))); } @@ -150,13 +150,13 @@ Formatter formatter = handler.getFormatter(); writer.getBuffer().setLength(0); handler.flush(); - assertEquals(writer.toString(), "flush"); - assertEquals(handler.getFilter(), filter); - assertEquals(handler.getFormatter(), formatter); + assertEquals("flush", writer.toString()); + assertEquals(filter, handler.getFilter()); + assertEquals(formatter, handler.getFormatter()); assertNull(handler.getEncoding()); assertNotNull(handler.getErrorManager()); - assertEquals(handler.getLevel(), Level.FINE); - assertEquals(handler.getPushLevel(), Level.WARNING); + assertEquals(Level.FINE, handler.getLevel()); + assertEquals(Level.WARNING, handler.getPushLevel()); assertTrue(handler.isLoggable(new LogRecord(Level.SEVERE, "test"))); } @@ -190,8 +190,8 @@ assertTrue(handler.getFormatter() instanceof MockFormatter); assertNull(handler.getEncoding()); assertNotNull(handler.getErrorManager()); - assertEquals(handler.getLevel(), Level.FINE); - assertEquals(handler.getPushLevel(), Level.WARNING); + assertEquals(Level.FINE, handler.getLevel()); + assertEquals(Level.WARNING, handler.getPushLevel()); } public void testMemoryHandlerInvalidProps() throws IOException { @@ -229,7 +229,7 @@ manager.readConfiguration(EnvironmentHelper .PropertiesToInputStream(props)); handler = new MemoryHandler(); - assertEquals(handler.getLevel(), Level.ALL); + assertEquals(Level.ALL, handler.getLevel()); // invalid pushlevel initProps(); @@ -237,7 +237,7 @@ manager.readConfiguration(EnvironmentHelper .PropertiesToInputStream(props)); handler = new MemoryHandler(); - assertEquals(handler.getPushLevel(), Level.SEVERE); + assertEquals(Level.SEVERE, handler.getPushLevel()); // invalid filter initProps(); @@ -274,8 +274,8 @@ assertTrue(handler.getFormatter() instanceof SimpleFormatter); assertNull(handler.getEncoding()); assertNotNull(handler.getErrorManager()); - assertEquals(handler.getLevel(), Level.ALL); - assertEquals(handler.getPushLevel(), Level.SEVERE); + assertEquals(Level.ALL, handler.getLevel()); + assertEquals(Level.SEVERE, handler.getPushLevel()); } /* @@ -287,8 +287,8 @@ assertTrue(handler.getFormatter() instanceof MockFormatter); assertNull(handler.getEncoding()); assertNotNull(handler.getErrorManager()); - assertEquals(handler.getLevel(), Level.FINE); - assertEquals(handler.getPushLevel(), Level.FINEST); + assertEquals(Level.FINE, handler.getLevel()); + assertEquals(Level.FINEST, handler.getPushLevel()); assertNull(target.getFormatter()); try { @@ -321,7 +321,7 @@ } catch (NullPointerException e) { } handler.setPushLevel(Level.parse("123")); - assertEquals(handler.getPushLevel(), Level.parse("123")); + assertEquals(Level.parse("123"), handler.getPushLevel()); } public void testSetPushLevel() { @@ -330,13 +330,13 @@ LogRecord lr = new LogRecord(Level.CONFIG, "lr"); assertTrue(handler.isLoggable(lr)); handler.publish(lr); - assertEquals(writer.toString(), ""); - // assertEquals(writer.toString(), "flush"); + assertEquals("", writer.toString()); + // assertEquals("flush", writer.toString()); writer.getBuffer().setLength(0); handler.setPushLevel(Level.FINE); - assertEquals(writer.toString(), ""); + assertEquals("", writer.toString()); handler.publish(lr); - assertEquals(writer.toString(), lr.getMessage() + lr.getMessage()); + assertEquals(lr.getMessage() + lr.getMessage(), writer.toString()); } public void testPushPublic() { @@ -346,7 +346,7 @@ assertEquals("", writer.toString()); // trig push handler.publish(new LogRecord(Level.SEVERE, "MSG2")); - assertEquals(writer.toString(), "MSG1MSG2"); + assertEquals("MSG1MSG2", writer.toString()); writer.getBuffer().setLength(0); // push nothing handler.push(); @@ -371,7 +371,7 @@ assertEquals("", writer.toString()); // push all handler.push(); - assertEquals(writer.toString(), "MSG5MSG8"); + assertEquals("MSG5MSG8", writer.toString()); writer.getBuffer().setLength(0); handler.push(); assertEquals("", writer.toString()); Index: modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java (working copy) @@ -62,8 +62,8 @@ */ public void testConstructorNoResBundle_Normal() { MockLevel l = new MockLevel("level1", 1); - assertEquals(l.getName(), "level1"); - assertEquals(l.intValue(), 1); + assertEquals("level1", l.getName()); + assertEquals(1, l.intValue()); assertNull(l.getResourceBundleName()); } @@ -73,8 +73,8 @@ */ public void testConstructorNoResBundle_NullName() { MockLevel l = new MockLevel(null, -2); - assertEquals(l.getName(), null); - assertEquals(l.intValue(), -2); + assertNull(l.getName()); + assertEquals(-2, l.intValue()); assertNull(l.getResourceBundleName()); } @@ -84,8 +84,8 @@ */ // public void testConstructorNoResBundle_EmptyName() { // MockLevel l = new MockLevel("", -3); - // assertEquals(l.getName(), ""); - // assertEquals(l.intValue(), -3); + // assertEquals("", l.getName()); + // assertEquals(-3, l.intValue()); // assertNull(l.getResourceBundleName()); // } /* @@ -94,9 +94,9 @@ */ public void testConstructorHavingResBundle_Normal() { MockLevel l = new MockLevel("level1", 1, "resourceBundle"); - assertEquals(l.getName(), "level1"); - assertEquals(l.intValue(), 1); - assertEquals(l.getResourceBundleName(), "resourceBundle"); + assertEquals("level1", l.getName()); + assertEquals(1, l.intValue()); + assertEquals("resourceBundle", l.getResourceBundleName()); } /* @@ -106,7 +106,7 @@ public void testConstructorHavingResBundle_NullName() { MockLevel l = new MockLevel(null, -123, null); assertNull(l.getName()); - assertEquals(l.intValue(), -123); + assertEquals(-123, l.intValue()); assertNull(l.getResourceBundleName()); } @@ -117,9 +117,9 @@ // */ // public void testConstructorHavingResBundle_EmptyName() { // MockLevel l = new MockLevel("", -1000, ""); - // assertEquals(l.getName(), ""); - // assertEquals(l.intValue(), -1000); - // assertEquals(l.getResourceBundleName(), ""); + // assertEquals("", l.getName()); + // assertEquals(-1000, l.intValue()); + // assertEquals("", l.getResourceBundleName()); // } /* @@ -200,8 +200,8 @@ */ public void testParse_UndefinedNumber() { Level l = Level.parse("0"); - assertEquals(l.intValue(), 0); - assertEquals(l.getName(), "0"); + assertEquals(0, l.intValue()); + assertEquals("0", l.getName()); assertNull(l.getResourceBundleName()); } @@ -217,7 +217,7 @@ public void testParse_NegativeNumber() { Level l = Level.parse("-4"); - assertEquals(l.intValue(), -4); + assertEquals(-4, l.intValue()); assertEquals("-4", l.getName()); assertNull(l.getResourceBundleName()); } @@ -235,10 +235,10 @@ * Test method hashCode, with normal fields. */ public void testHashCode_Normal() { - assertEquals(Level.parse("100").hashCode(), 100); - assertEquals(Level.parse("-1").hashCode(), -1); - assertEquals(Level.parse("0").hashCode(), 0); - assertEquals(Level.parse("ALL").hashCode(), Integer.MIN_VALUE); + assertEquals(100, Level.parse("100").hashCode()); + assertEquals(-1, Level.parse("-1").hashCode()); + assertEquals(0, Level.parse("0").hashCode()); + assertEquals(Integer.MIN_VALUE, Level.parse("ALL").hashCode()); } /* @@ -286,7 +286,7 @@ * Test toString of a normal Level. */ public void testToString_Normal() { - assertEquals(Level.ALL.toString(), "ALL"); + assertEquals("ALL", Level.ALL.toString()); MockLevel l = new MockLevel("name", 2); assertEquals("name", l.toString()); @@ -300,7 +300,7 @@ */ public void testToString_Null() { MockLevel l = new MockLevel(null, 2); - assertEquals(null, l.toString()); + assertNull(l.toString()); } /* @@ -355,19 +355,19 @@ MyLevel.DUPLICATENAME.getName();// just to load MyLevel class // test duplicated name and num - assertEquals(MyLevel.parse("800").getName(), "INFO"); - assertEquals(MyLevel.parse("INFO").intValue(), 800); + assertEquals("INFO", MyLevel.parse("800").getName()); + assertEquals(800, MyLevel.parse("INFO").intValue()); // test duplicated name - assertEquals(MyLevel.parse("499").getName(), "FINE"); - assertEquals(MyLevel.parse("500").getName(), "FINE"); - assertEquals(MyLevel.parse("FINE").intValue(), 500); + assertEquals("FINE", MyLevel.parse("499").getName()); + assertEquals("FINE", MyLevel.parse("500").getName()); + assertEquals(500, MyLevel.parse("FINE").intValue()); // test duplicated number - assertEquals(MyLevel.parse("300").getName(), "FINEST"); - assertEquals(MyLevel.parse("FINEST").intValue(), 300); - assertEquals(MyLevel.parse("MYLEVEL1").intValue(), 300); + assertEquals("FINEST", MyLevel.parse("300").getName()); + assertEquals(300, MyLevel.parse("FINEST").intValue()); + assertEquals(300, MyLevel.parse("MYLEVEL1").intValue()); // test a normal new level, without duplicated elements - assertEquals(MyLevel.parse("299").getName(), "MYLEVEL2"); - assertEquals(MyLevel.parse("MYLEVEL2").intValue(), 299); + assertEquals("MYLEVEL2", MyLevel.parse("299").getName()); + assertEquals(299, MyLevel.parse("MYLEVEL2").intValue()); } /* Index: modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java (working copy) @@ -157,7 +157,7 @@ i++; assertEquals("foo", name); } - assertEquals(i, 1); + assertEquals(1, i); } public void testAddGetLogger_duplicateName() { @@ -447,7 +447,7 @@ root = mockManager.getLogger(""); checkPropertyNull(mockManager); assertEquals(0, root.getHandlers().length); - assertEquals(null, root.getLevel()); + assertNull(root.getLevel()); mockManager.readConfiguration(); assertEquals(Level.INFO, root.getLevel()); checkProperty(mockManager); @@ -499,22 +499,20 @@ } private static void checkProperty(LogManager m) { - // assertEquals(m.getProperty(".level"), "INFO"); - assertEquals(m.getProperty("java.util.logging.FileHandler.limit"), - "50000"); - assertEquals(m - .getProperty("java.util.logging.ConsoleHandler.formatter"), - "java.util.logging.SimpleFormatter"); + // assertEquals("INFO", m.getProperty(".level")); + assertEquals("50000", + m.getProperty("java.util.logging.FileHandler.limit")); + assertEquals("java.util.logging.SimpleFormatter", + m.getProperty("java.util.logging.ConsoleHandler.formatter")); // assertEquals(m.getProperty("handlers"), // "java.util.logging.ConsoleHandler"); - assertEquals(m.getProperty("java.util.logging.FileHandler.count"), "1"); - assertEquals(m.getProperty("com.xyz.foo.level"), "SEVERE"); - assertEquals(m.getProperty("java.util.logging.FileHandler.formatter"), - "java.util.logging.XMLFormatter"); - assertEquals(m.getProperty("java.util.logging.ConsoleHandler.level"), - "INFO"); - assertEquals(m.getProperty("java.util.logging.FileHandler.pattern"), - "%h/java%u.log"); + assertEquals("1", m.getProperty("java.util.logging.FileHandler.count")); + assertEquals("SEVERE", m.getProperty("com.xyz.foo.level")); + assertEquals("java.util.logging.XMLFormatter", + m.getProperty("java.util.logging.FileHandler.formatter")); + assertEquals("INFO", m.getProperty("java.util.logging.ConsoleHandler.level")); + assertEquals("%h/java%u.log", + m.getProperty("java.util.logging.FileHandler.pattern")); } public void testReadConfiguration() throws SecurityException, IOException { @@ -522,7 +520,7 @@ try { Logger foo = new MockLogger("foo", null); - assertEquals(null, foo.getLevel()); + assertNull(foo.getLevel()); assertTrue(mockManager.addLogger(foo)); Logger fo = new MockLogger("foo2", null); @@ -538,7 +536,7 @@ // level DO has effect assertEquals(Level.WARNING, foo.getLevel()); // for non specifed logger, level is reset to null - assertEquals(null, fo.getLevel()); + assertNull(fo.getLevel()); // handlers has no effect assertEquals(0, foo.getHandlers().length); @@ -561,7 +559,7 @@ InputStream stream = EnvironmentHelper.PropertiesToInputStream(props); Logger foo = new MockLogger("foo", null); - assertEquals(null, foo.getLevel()); + assertNull(foo.getLevel()); assertTrue(mockManager.addLogger(foo)); Logger fo = new MockLogger("foo2", null); @@ -581,7 +579,7 @@ // handlers has no effect assertEquals(0, foo.getHandlers().length); // for non specifed logger, level is reset to null - assertEquals(null, fo.getLevel()); + assertNull(fo.getLevel()); // read properties don't affect handler assertNotSame(Level.OFF, h.getLevel()); @@ -609,11 +607,11 @@ .getLogger("testReadConfigurationInputStream_root.foo2"); manager.addLogger(logger); - assertEquals(null, logger.getLevel()); + assertNull(logger.getLevel()); assertEquals(0, logger.getHandlers().length); assertSame(root, logger.getParent()); - assertEquals(null, logger2.getLevel()); + assertNull(logger2.getLevel()); assertEquals(0, logger2.getHandlers().length); assertSame(root, logger2.getParent()); // if (!hasConfigClass) { @@ -625,7 +623,7 @@ manager.readConfiguration(stream); assertEquals(Level.FINE, root.getLevel()); assertEquals(2, root.getHandlers().length); - assertEquals(null, logger.getLevel()); + assertNull(logger.getLevel()); assertEquals(0, logger.getHandlers().length); stream.close(); } @@ -687,7 +685,7 @@ mockManager.readConfiguration(); assertNotNull(mockManager.getProperty("handlers")); Logger foo = new MockLogger("foo", null); - assertEquals(null, foo.getLevel()); + assertNull(foo.getLevel()); foo.setLevel(Level.ALL); foo.addHandler(new ConsoleHandler()); assertTrue(mockManager.addLogger(foo)); @@ -701,7 +699,7 @@ assertNull(mockManager.getProperty("handlers")); // level is null - assertEquals(null, foo.getLevel()); + assertNull(foo.getLevel()); // handlers are all closed assertEquals(0, foo.getHandlers().length); @@ -821,7 +819,7 @@ e.printStackTrace(); } checkProperty(manager); - assertEquals(root.getHandlers()[0].getLevel(), null); + assertNull(root.getHandlers()[0].getLevel()); assertEquals(1, root.getHandlers().length); assertEquals(Level.INFO, root.getLevel()); Index: modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java (working copy) @@ -89,10 +89,12 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.MockHandler.level"), "FINE"); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.MockHandler.encoding"), "utf-8"); + assertEquals("FINE", + LogManager.getLogManager().getProperty( + "java.util.logging.MockHandler.level")); + assertEquals("utf-8", + LogManager.getLogManager().getProperty( + "java.util.logging.MockHandler.encoding")); MockHandler h = new MockHandler(); assertSame(h.getLevel(), Level.ALL); assertNull(h.getFormatter()); @@ -502,7 +504,7 @@ h.reportError(null, null, 0); assertEquals(0, CallVerificationStack.getInstance().popInt()); assertSame(null, CallVerificationStack.getInstance().pop()); - assertEquals(null, CallVerificationStack.getInstance().pop()); + assertNull(CallVerificationStack.getInstance().pop()); } catch (SecurityException e) { fail("Should not throw SecurityException!"); } finally { Index: modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java (working copy) @@ -145,10 +145,10 @@ * Class under test for void FileHandler() */ public void testFileHandler() throws Exception { - assertEquals(handler.getEncoding(), "iso-8859-1"); + assertEquals("iso-8859-1", handler.getEncoding()); assertTrue(handler.getFilter() instanceof MockFilter); assertTrue(handler.getFormatter() instanceof MockFormatter); - assertEquals(handler.getLevel(), Level.FINE); + assertEquals(Level.FINE, handler.getLevel()); assertNotNull(handler.getErrorManager()); handler.publish(r); handler.close(); @@ -227,7 +227,7 @@ // System.out.println(new String(chars)); assertEquals(msg, new String(chars)); // assert has reached the end of the file - assertEquals(reader.read(), -1); + assertEquals(-1, reader.read()); } finally { try { reader.close(); @@ -429,7 +429,7 @@ .PropertiesToInputStream(props)); handler = new FileHandler(); assertEquals(Level.ALL, handler.getLevel()); - assertEquals(null, handler.getFilter()); + assertNull(handler.getFilter()); assertTrue(handler.getFormatter() instanceof XMLFormatter); assertNull(handler.getEncoding()); handler.close(); Index: modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java (working copy) @@ -129,7 +129,7 @@ assertNull(mlog.getFilter()); assertEquals(0, mlog.getHandlers().length); assertNull(mlog.getLevel()); - assertEquals(null, mlog.getName()); + assertNull(mlog.getName()); assertNull(mlog.getParent()); assertNull(mlog.getResourceBundle()); assertNull(mlog.getResourceBundleName()); @@ -183,7 +183,7 @@ assertNull(alog.getFilter()); assertEquals(0, alog.getHandlers().length); assertNull(alog.getLevel()); - assertEquals(null, alog.getName()); + assertNull(alog.getName()); assertNull(alog.getParent().getParent()); assertNull(alog.getResourceBundle()); assertNull(alog.getResourceBundleName()); @@ -205,7 +205,7 @@ assertNull(alog.getFilter()); assertEquals(0, alog.getHandlers().length); assertNull(alog.getLevel()); - assertEquals(null, alog.getName()); + assertNull(alog.getName()); assertNull(alog.getParent().getParent()); assertEquals(VALID_VALUE, alog.getResourceBundle().getString(VALID_KEY)); assertEquals(alog.getResourceBundleName(), VALID_RESOURCE_BUNDLE); @@ -222,7 +222,7 @@ assertNull(alog.getFilter()); assertEquals(0, alog.getHandlers().length); assertNull(alog.getLevel()); - assertEquals(null, alog.getName()); + assertNull(alog.getName()); assertNull(alog.getParent().getParent()); assertNull(alog.getResourceBundle()); assertNull(alog.getResourceBundleName()); @@ -582,9 +582,9 @@ Logger log = Logger .getLogger("testAddHandler_NamedLoggerSufficientPrivilege"); MockHandler h = new MockHandler(); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); log.addHandler(h); - assertEquals(log.getHandlers().length, 1); + assertEquals(1, log.getHandlers().length); assertSame(log.getHandlers()[0], h); } @@ -596,10 +596,10 @@ Logger log = Logger .getLogger("testAddHandler_NamedLoggerSufficientPrivilegeDuplicate"); MockHandler h = new MockHandler(); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); log.addHandler(h); log.addHandler(h); - assertEquals(log.getHandlers().length, 2); + assertEquals(2, log.getHandlers().length); assertSame(log.getHandlers()[0], h); assertSame(log.getHandlers()[1], h); } @@ -614,7 +614,7 @@ fail("Should throw NullPointerException!"); } catch (NullPointerException e) { } - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } /* @@ -662,9 +662,9 @@ public void testAddHandler_AnonyLoggerSufficientPrivilege() { Logger log = Logger.getAnonymousLogger(); MockHandler h = new MockHandler(); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); log.addHandler(h); - assertEquals(log.getHandlers().length, 1); + assertEquals(1, log.getHandlers().length); assertSame(log.getHandlers()[0], h); } @@ -678,9 +678,9 @@ SecurityManager oldMan = System.getSecurityManager(); System.setSecurityManager(new MockSecurityManager()); try { - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); log.addHandler(h); - assertEquals(log.getHandlers().length, 1); + assertEquals(1, log.getHandlers().length); assertSame(log.getHandlers()[0], h); } finally { System.setSecurityManager(oldMan); @@ -714,9 +714,9 @@ .getLogger("testRemoveHandler_NamedLoggerSufficientPrivilege"); MockHandler h = new MockHandler(); log.addHandler(h); - assertEquals(log.getHandlers().length, 1); + assertEquals(1, log.getHandlers().length); log.removeHandler(h); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } /* @@ -727,9 +727,9 @@ Logger log = Logger .getLogger("testRemoveHandler_NamedLoggerSufficientPrivilegeNotExisting"); MockHandler h = new MockHandler(); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); log.removeHandler(h); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } /* @@ -742,7 +742,7 @@ fail("Should throw NullPointerException!"); } catch (NullPointerException e) { } - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } /* @@ -792,9 +792,9 @@ Logger log = Logger.getAnonymousLogger(); MockHandler h = new MockHandler(); log.addHandler(h); - assertEquals(log.getHandlers().length, 1); + assertEquals(1, log.getHandlers().length); log.removeHandler(h); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } /* @@ -808,9 +808,9 @@ System.setSecurityManager(new MockSecurityManager()); try { log.addHandler(h); - assertEquals(log.getHandlers().length, 1); + assertEquals(1, log.getHandlers().length); log.removeHandler(h); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } finally { System.setSecurityManager(oldMan); } @@ -839,7 +839,7 @@ */ public void testGetHandlers_None() { Logger log = Logger.getLogger("testGetHandlers_None"); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); } /* @@ -847,20 +847,20 @@ */ public void testGetHandlers_Several() { Logger log = Logger.getLogger("testGetHandlers_None"); - assertEquals(log.getHandlers().length, 0); + assertEquals(0, log.getHandlers().length); MockHandler h1 = new MockHandler(); MockHandler h2 = new MockHandler(); MockHandler h3 = new MockHandler(); log.addHandler(h1); log.addHandler(h2); log.addHandler(h3); - assertEquals(log.getHandlers().length, 3); + assertEquals(3, log.getHandlers().length); assertSame(log.getHandlers()[0], h1); assertSame(log.getHandlers()[1], h2); assertSame(log.getHandlers()[2], h3); // remove one log.removeHandler(h2); - assertEquals(log.getHandlers().length, 2); + assertEquals(2, log.getHandlers().length); assertSame(log.getHandlers()[0], h1); assertSame(log.getHandlers()[1], h3); } @@ -1246,10 +1246,10 @@ */ public void testGetName_Null() { Logger log = Logger.getAnonymousLogger(); - assertEquals(null, log.getName()); + assertNull(log.getName()); Logger mlog = new MockLogger(null, null); - assertEquals(null, mlog.getName()); + assertNull(mlog.getName()); } /* @@ -1272,7 +1272,7 @@ assertNull(log.getResourceBundle()); Logger mlog = new MockLogger(null, null); - assertEquals(null, mlog.getResourceBundle()); + assertNull(mlog.getResourceBundle()); } /* @@ -1284,7 +1284,7 @@ assertEquals(VALID_RESOURCE_BUNDLE, log.getResourceBundleName()); Logger mlog = new MockLogger(null, null); - assertEquals(null, mlog.getResourceBundleName()); + assertNull(mlog.getResourceBundleName()); } /* @@ -1295,7 +1295,7 @@ assertNull(log.getResourceBundleName()); Logger mlog = new MockLogger(null, null); - assertEquals(null, mlog.getResourceBundleName()); + assertNull(mlog.getResourceBundleName()); } /* @@ -1341,7 +1341,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "THROW"); + assertEquals("THROW", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -1370,7 +1370,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), "THROW"); + assertEquals("THROW", r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); @@ -1389,7 +1389,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "ENTRY"); + assertEquals("ENTRY", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -1418,7 +1418,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), "ENTRY"); + assertEquals("ENTRY", r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); @@ -1438,7 +1438,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "ENTRY {0}"); + assertEquals("ENTRY {0}", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -1468,14 +1468,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), "ENTRY {0}"); + assertEquals("ENTRY {0}", r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINER); - assertEquals(r.getParameters().length, 1); - assertEquals(r.getParameters()[0], null); + assertEquals(1, r.getParameters().length); + assertNull(r.getParameters()[0]); assertSame(r.getThrown(), null); } @@ -1491,7 +1491,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "ENTRY {0} {1}"); + assertEquals("ENTRY {0} {1}", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -1523,7 +1523,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), "ENTRY"); + assertEquals("ENTRY", r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); @@ -1565,7 +1565,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "RETURN"); + assertEquals("RETURN", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -1594,7 +1594,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), "RETURN"); + assertEquals("RETURN", r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); @@ -1614,7 +1614,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "RETURN {0}"); + assertEquals("RETURN {0}", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -1644,14 +1644,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), "RETURN {0}"); + assertEquals("RETURN {0}", r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINER); - assertEquals(r.getParameters().length, 1); - assertEquals(r.getParameters()[0], null); + assertEquals(1, r.getParameters().length); + assertNull(r.getParameters()[0]); assertSame(r.getThrown(), null); } @@ -1664,14 +1664,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "config msg"); + assertEquals("config msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.CONFIG); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.INFO); @@ -1693,13 +1693,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.CONFIG); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.INFO); @@ -1717,13 +1717,13 @@ assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); - assertEquals(r.getMessage(), "fine msg"); + assertEquals("fine msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.CONFIG); @@ -1745,13 +1745,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.CONFIG); @@ -1768,14 +1768,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "finer msg"); + assertEquals("finer msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINER); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.FINE); @@ -1797,13 +1797,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINER); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.FINE); @@ -1820,14 +1820,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "finest msg"); + assertEquals("finest msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINEST); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.FINER); @@ -1849,13 +1849,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINEST); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.FINER); @@ -1872,14 +1872,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "info msg"); + assertEquals("info msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.WARNING); @@ -1901,13 +1901,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.WARNING); @@ -1924,14 +1924,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "warning msg"); + assertEquals("warning msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.WARNING); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.SEVERE); @@ -1953,13 +1953,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.WARNING); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.SEVERE); @@ -1976,14 +1976,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "severe msg"); + assertEquals("severe msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.SEVERE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.OFF); @@ -2005,13 +2005,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.SEVERE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.setLevel(Level.OFF); @@ -2028,14 +2028,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "log(Level, String) msg"); + assertEquals("log(Level, String) msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.log(Level.CONFIG, "log(Level, String) msg"); @@ -2059,13 +2059,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2092,7 +2092,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "log(Level, String, Object) msg"); + assertEquals("log(Level, String, Object) msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -2126,14 +2126,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); assertEquals(1, r.getParameters().length); - assertEquals(null, r.getParameters()[0]); + assertNull(r.getParameters()[0]); assertSame(r.getThrown(), null); } @@ -2163,7 +2163,7 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "log(Level, String, Object[]) msg"); + assertEquals("log(Level, String, Object[]) msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -2198,13 +2198,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2232,14 +2232,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "log(Level, String, Throwable) msg"); + assertEquals("log(Level, String, Throwable) msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), t); this.sharedLogger.log(Level.CONFIG, @@ -2265,13 +2265,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2298,14 +2298,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), "logp(Level, String, String, String) msg"); + assertEquals("logp(Level, String, String, String) msg", r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.logp(Level.CONFIG, "sourceClass", "sourceMethod", @@ -2331,13 +2331,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2365,8 +2365,8 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logp(Level, String, String, String, Object) msg"); + assertEquals("logp(Level, String, String, String, Object) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -2401,14 +2401,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); assertEquals(1, r.getParameters().length); - assertEquals(null, r.getParameters()[0]); + assertNull(r.getParameters()[0]); assertSame(r.getThrown(), null); } @@ -2439,8 +2439,8 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logp(Level, String, String, String, Object[]) msg"); + assertEquals("logp(Level, String, String, String, Object[]) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); @@ -2476,13 +2476,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2511,15 +2511,15 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logp(Level, String, String, String, Throwable) msg"); + assertEquals("logp(Level, String, String, String, Throwable) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), this.sharedLogger .getResourceBundleName()); assertSame(r.getResourceBundle(), this.sharedLogger.getResourceBundle()); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), t); this.sharedLogger.logp(Level.CONFIG, "sourceClass", "sourceMethod", @@ -2546,13 +2546,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), child.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), parent.getResourceBundleName()); assertSame(r.getResourceBundle(), parent.getResourceBundle()); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2581,14 +2581,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String) msg"); + assertEquals("logrb(Level, String, String, String, String) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2); assertEquals(VALID_VALUE2, r.getResourceBundle().getString(VALID_KEY)); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); this.sharedLogger.logrb(Level.CONFIG, "sourceClass", "sourceMethod", @@ -2611,12 +2611,12 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2646,14 +2646,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String) msg"); + assertEquals("logrb(Level, String, String, String, String) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), INVALID_RESOURCE_BUNDLE); assertSame(r.getResourceBundle(), null); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); assertSame(r.getLevel(), Level.ALL); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2671,8 +2671,8 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String, Object) msg"); + assertEquals("logrb(Level, String, String, String, String, Object) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); @@ -2705,13 +2705,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); assertEquals(1, r.getParameters().length); - assertEquals(null, r.getParameters()[0]); + assertNull(r.getParameters()[0]); assertSame(r.getThrown(), null); } @@ -2744,8 +2744,8 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String) msg"); + assertEquals("logrb(Level, String, String, String, String) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), INVALID_RESOURCE_BUNDLE); assertSame(r.getResourceBundle(), null); assertSame(r.getSourceClassName(), "sourceClass"); @@ -2772,8 +2772,8 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String, Object[]) msg"); + assertEquals("logrb(Level, String, String, String, String, Object[]) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); @@ -2807,12 +2807,12 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2851,8 +2851,8 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String) msg"); + assertEquals("logrb(Level, String, String, String, String) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), INVALID_RESOURCE_BUNDLE); assertSame(r.getResourceBundle(), null); assertSame(r.getSourceClassName(), "sourceClass"); @@ -2878,13 +2878,13 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String, Throwable) msg"); + assertEquals("logrb(Level, String, String, String, String, Throwable) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); assertSame(r.getLevel(), Level.parse("1611")); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), t); assertNull(Level.parse("1611").getResourceBundleName()); @@ -2912,12 +2912,12 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), null); + assertNull(r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -2954,14 +2954,14 @@ LogRecord r = (LogRecord) CallVerificationStack.getInstance().pop(); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), this.sharedLogger.getName()); - assertEquals(r.getMessage(), - "logrb(Level, String, String, String, String) msg"); + assertEquals("logrb(Level, String, String, String, String) msg", + r.getMessage()); assertSame(r.getResourceBundleName(), INVALID_RESOURCE_BUNDLE); assertSame(r.getResourceBundle(), null); assertSame(r.getSourceClassName(), "sourceClass"); assertSame(r.getSourceMethodName(), "sourceMethod"); assertSame(r.getLevel(), Level.ALL); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), t); } @@ -2979,13 +2979,13 @@ assertSame(r, CallVerificationStack.getInstance().pop()); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), null); - assertEquals(r.getMessage(), - "testLog_LogRecord_AppropriateLevelNoFilterNoParent"); + assertEquals("testLog_LogRecord_AppropriateLevelNoFilterNoParent", + r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -3037,13 +3037,13 @@ assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), null); - assertEquals(r.getMessage(), - "testLog_LogRecord_AppropriateLevelTrueFilterNoParent"); + assertEquals("testLog_LogRecord_AppropriateLevelTrueFilterNoParent", + r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -3064,13 +3064,13 @@ assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), null); - assertEquals(r.getMessage(), - "testLog_LogRecord_AppropriateLevelFalseFilterNoParent"); + assertEquals("testLog_LogRecord_AppropriateLevelFalseFilterNoParent", + r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); } @@ -3095,12 +3095,12 @@ assertSame(r, CallVerificationStack.getInstance().pop()); assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), null); - assertEquals(r.getMessage(), "testLog_ParentInformed"); + assertEquals("testLog_ParentInformed", r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.INFO); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); // set the child logger to disabling level @@ -3238,12 +3238,12 @@ assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), null); - assertEquals(r.getMessage(), "testLog_NullLevelHasParent"); + assertEquals("testLog_NullLevelHasParent", r.getMessage()); assertSame(r.getResourceBundleName(), null); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); assertNull(child.getLevel()); @@ -3309,12 +3309,12 @@ assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), "childLogger"); - assertEquals(r.getMessage(), "testLog_NullResHasParent"); + assertEquals("testLog_NullResHasParent", r.getMessage()); assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); assertNull(child.getResourceBundle()); assertNull(child.getResourceBundleName()); @@ -3342,12 +3342,12 @@ assertTrue(CallVerificationStack.getInstance().empty()); assertSame(r.getLoggerName(), "childLogger"); - assertEquals(r.getMessage(), "testLog_NullResHasAncestor"); + assertEquals("testLog_NullResHasAncestor", r.getMessage()); assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE3); assertSame(r.getSourceClassName(), null); assertSame(r.getSourceMethodName(), null); assertSame(r.getLevel(), Level.FINE); - assertEquals(null, r.getParameters()); + assertNull(r.getParameters()); assertSame(r.getThrown(), null); assertNull(child.getResourceBundle()); assertNull(child.getResourceBundleName()); Index: modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java (working copy) @@ -164,15 +164,15 @@ lr = new LogRecord(Level.SEVERE, MSG); lr.setSourceMethodName(null); logger.log(lr); - assertEquals(null, handler.getSourceClassName()); - assertEquals(null, handler.getSourceMethodName()); + assertNull(handler.getSourceClassName()); + assertNull(handler.getSourceMethodName()); // only set source class to null lr = new LogRecord(Level.SEVERE, MSG); lr.setSourceClassName(null); logger.log(lr); - assertEquals(null, handler.getSourceClassName()); - assertEquals(null, handler.getSourceMethodName()); + assertNull(handler.getSourceClassName()); + assertNull(handler.getSourceMethodName()); // set both lr = new LogRecord(Level.SEVERE, MSG); @@ -180,7 +180,7 @@ lr.setSourceMethodName(null); logger.log(lr); assertEquals("className", handler.getSourceClassName()); - assertEquals(null, handler.getSourceMethodName()); + assertNull(handler.getSourceMethodName()); // test if LogRecord is constructed in another class, and is published // by Logger Index: modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java (working copy) @@ -152,8 +152,8 @@ h = new SocketHandler("127.0.0.1", 6666); assertSame(h.getLevel(), Level.ALL); assertTrue(h.getFormatter() instanceof XMLFormatter); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); h.close(); // ensure the thread exits and the port becomes available again thread.getReadString(); @@ -186,8 +186,8 @@ h = new SocketHandler(); assertSame(h.getLevel(), Level.ALL); assertTrue(h.getFormatter() instanceof XMLFormatter); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); h.close(); // ensure the thread exits and the port becomes available again thread.getReadString(); @@ -260,7 +260,7 @@ assertSame(h.getLevel(), Level.parse("FINE")); assertTrue(h.getFormatter() instanceof MockFormatter); assertTrue(h.getFilter() instanceof MockFilter); - assertEquals(h.getEncoding(), "iso-8859-1"); + assertEquals("iso-8859-1", h.getEncoding()); h.close(); // ensure the thread exits and the port becomes available again thread.getReadString(); @@ -274,7 +274,7 @@ assertSame(h.getLevel(), Level.parse("FINE")); assertTrue(h.getFormatter() instanceof MockFormatter); assertTrue(h.getFilter() instanceof MockFilter); - assertEquals(h.getEncoding(), "iso-8859-1"); + assertEquals("iso-8859-1", h.getEncoding()); h.close(); // ensure the thread exits and the port becomes available again thread.getReadString(); @@ -303,10 +303,10 @@ h = new SocketHandler(); assertSame(h.getLevel(), Level.ALL); assertTrue(h.getFormatter() instanceof XMLFormatter); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); h.publish(new LogRecord(Level.SEVERE, "test")); - assertEquals(h.getEncoding(), null); + assertNull(h.getEncoding()); h.close(); // ensure the thread exits and the port becomes available again thread.getReadString(); @@ -319,10 +319,10 @@ h = new SocketHandler("127.0.0.1", 6666); assertSame(h.getLevel(), Level.ALL); assertTrue(h.getFormatter() instanceof XMLFormatter); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); h.publish(new LogRecord(Level.SEVERE, "test")); - assertEquals(h.getEncoding(), null); + assertNull(h.getEncoding()); h.close(); // ensure the thread exits and the port becomes available again thread.getReadString(); Index: modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java =================================================================== --- modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java (revision 394268) +++ modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java (working copy) @@ -136,15 +136,17 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.level"), "FINE"); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.encoding"), "iso-8859-1"); + assertEquals("FINE", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.level")); + assertEquals("iso-8859-1", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.encoding")); StreamHandler h = new StreamHandler(); assertSame(h.getLevel(), Level.parse("FINE")); assertTrue(h.getFormatter() instanceof MockFormatter); assertTrue(h.getFilter() instanceof MockFilter); - assertEquals(h.getEncoding(), "iso-8859-1"); + assertEquals("iso-8859-1", h.getEncoding()); } /* @@ -161,18 +163,20 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.level"), INVALID_LEVEL); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.encoding"), "XXXX"); + assertEquals(INVALID_LEVEL, + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.level")); + assertEquals("XXXX", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.encoding")); StreamHandler h = new StreamHandler(); assertSame(h.getLevel(), Level.INFO); assertTrue(h.getFormatter() instanceof SimpleFormatter); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); h.publish(new LogRecord(Level.SEVERE, "test")); assertTrue(CallVerificationStack.getInstance().empty()); - assertEquals(h.getEncoding(), null); + assertNull(h.getEncoding()); } /* @@ -241,16 +245,18 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.level"), "FINE"); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.encoding"), "iso-8859-1"); + assertEquals("FINE", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.level")); + assertEquals("iso-8859-1", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.encoding")); StreamHandler h = new StreamHandler(new ByteArrayOutputStream(), new MockFormatter2()); assertSame(h.getLevel(), Level.parse("FINE")); assertTrue(h.getFormatter() instanceof MockFormatter2); assertTrue(h.getFilter() instanceof MockFilter); - assertEquals(h.getEncoding(), "iso-8859-1"); + assertEquals("iso-8859-1", h.getEncoding()); } /* @@ -267,16 +273,18 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.level"), INVALID_LEVEL); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.encoding"), "XXXX"); + assertEquals(INVALID_LEVEL, + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.level")); + assertEquals("XXXX", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.encoding")); StreamHandler h = new StreamHandler(new ByteArrayOutputStream(), new MockFormatter2()); assertSame(h.getLevel(), Level.INFO); assertTrue(h.getFormatter() instanceof MockFormatter2); - assertEquals(h.getFilter(), null); - assertEquals(h.getEncoding(), null); + assertNull(h.getFilter()); + assertNull(h.getEncoding()); } /* @@ -295,10 +303,11 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.level"), "FINE"); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.encoding"), "iso-8859-1"); + assertEquals("FINE", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.level")); + assertEquals("iso-8859-1", LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.encoding")); try { StreamHandler h = new StreamHandler(new ByteArrayOutputStream(), null); @@ -323,10 +332,12 @@ LogManager.getLogManager().readConfiguration( EnvironmentHelper.PropertiesToInputStream(p)); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.level"), "FINE"); - assertEquals(LogManager.getLogManager().getProperty( - "java.util.logging.StreamHandler.encoding"), "iso-8859-1"); + assertEquals("FINE", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.level")); + assertEquals("iso-8859-1", + LogManager.getLogManager().getProperty( + "java.util.logging.StreamHandler.encoding")); try { StreamHandler h = new StreamHandler(null, new MockFormatter2()); fail("Should throw NullPointerException!"); Index: modules/beans/src/test/java/org/apache/harmony/tests/java/beans/StatementTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/java/beans/StatementTest.java (revision 394268) +++ modules/beans/src/test/java/org/apache/harmony/tests/java/beans/StatementTest.java (working copy) @@ -125,8 +125,8 @@ new Object[] { new Integer(5), new Character('a') }); try { s.execute(); - assertFalse("Exception must be thrown while Bean.setChar(5, 'a') " - + "invocation.", true); + fail("Exception must be thrown while Bean.setChar(5, 'a') " + + "invocation."); } catch (Exception e) { assertTrue(true); } @@ -141,9 +141,7 @@ new Object[] {} ); try { s.execute(); - assertFalse( - "Exception must be thrown with methodWithException call", - true); + fail("Exception must be thrown with methodWithException call"); } catch (SampleException se) { assertTrue("SampleException is thrown as expected", true); } catch (Exception e) { @@ -160,9 +158,9 @@ try { s.execute(); assertTrue("No exception is thrown for methodWithIntArray call", - true); + true); } catch (Exception e) { - assertTrue("Non expected exception: " + e.getClass(), false); + fail("Non expected exception: " + e.getClass()); } } Index: modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java (revision 394268) +++ modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java (working copy) @@ -120,6 +120,6 @@ } private void checkValues(SampleBean sampleBean) { - assertEquals(null, sampleBean.getText()); + assertNull(sampleBean.getText()); } } \ No newline at end of file Index: modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java (revision 394268) +++ modules/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java (working copy) @@ -54,37 +54,37 @@ sslConSpi.engineGetSocketFactory(); fail("RuntimeException must be thrown"); } catch (RuntimeException e) { - assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); + assertEquals("Incorrect message", "Not initialiazed", e.getMessage()); } try { sslConSpi.engineGetServerSocketFactory(); fail("RuntimeException must be thrown"); } catch (RuntimeException e) { - assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); + assertEquals("Incorrect message", "Not initialiazed", e.getMessage()); } try { sslConSpi.engineGetServerSessionContext(); fail("RuntimeException must be thrown"); } catch (RuntimeException e) { - assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); + assertEquals("Incorrect message", "Not initialiazed", e.getMessage()); } try { sslConSpi.engineGetClientSessionContext(); fail("RuntimeException must be thrown"); } catch (RuntimeException e) { - assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); + assertEquals("Incorrect message", "Not initialiazed", e.getMessage()); } try { sslConSpi.engineCreateSSLEngine(); fail("RuntimeException must be thrown"); } catch (RuntimeException e) { - assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); + assertEquals("Incorrect message", "Not initialiazed", e.getMessage()); } try { sslConSpi.engineCreateSSLEngine("host",1); fail("RuntimeException must be thrown"); } catch (RuntimeException e) { - assertEquals("Incorrect message", e.getMessage(),"Not initialiazed"); + assertEquals("Incorrect message", "Not initialiazed", e.getMessage()); } sslConSpi.engineInit(null, null, new SecureRandom()); assertNull("Not null result", sslConSpi.engineGetSocketFactory()); Index: modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java =================================================================== --- modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java (revision 394268) +++ modules/x-net/src/test/java/javax/net/ssl/SSLEngineTest.java (working copy) @@ -44,7 +44,7 @@ public void test01() { SSLEngine e = new mySSLEngine(); assertNull(e.getPeerHost()); - assertEquals(e.getPeerPort(), -1); + assertEquals(-1, e.getPeerPort()); String[] suites = { "a", "b", "c" }; e.setEnabledCipherSuites(suites); assertEquals(e.getEnabledCipherSuites().length, suites.length); @@ -57,7 +57,7 @@ int port = 1010; SSLEngine e = new mySSLEngine(null, port); assertNull(e.getPeerHost()); - assertEquals(e.getPeerPort(), port); + assertEquals(port, e.getPeerPort()); try { e.beginHandshake(); } catch (SSLException ex) { @@ -183,8 +183,8 @@ } catch (SSLException ex) { } SSLEngineResult res = e.wrap(bbd, bbs); - assertEquals(res.bytesConsumed(), 10); - assertEquals(res.bytesProduced(), 20); + assertEquals(10, res.bytesConsumed()); + assertEquals(20, res.bytesProduced()); try { e.wrap(new ByteBuffer[] { bbs }, bbd); @@ -192,8 +192,8 @@ } catch (SSLException ex) { } res = e.wrap(new ByteBuffer[] { bbd }, bbs); - assertEquals(res.bytesConsumed(), 10); - assertEquals(res.bytesProduced(), 20); + assertEquals(10, res.bytesConsumed()); + assertEquals(20, res.bytesProduced()); } /** @@ -209,8 +209,8 @@ SSLEngine e = new mySSLEngine(host, port); SSLEngineResult res = e.wrap(bb, ByteBuffer.allocate(10)); - assertEquals(res.bytesConsumed(), 10); - assertEquals(res.bytesProduced(), 20); + assertEquals(10, res.bytesConsumed()); + assertEquals(20, res.bytesProduced()); } /** @@ -228,8 +228,8 @@ SSLEngine e = new mySSLEngine(host, port); SSLEngineResult res = e.wrap(bbA, bb); - assertEquals(res.bytesConsumed(), 10); - assertEquals(res.bytesProduced(), 20); + assertEquals(10, res.bytesConsumed()); + assertEquals(20, res.bytesProduced()); } /** @@ -336,8 +336,8 @@ } catch (SSLException ex) { } SSLEngineResult res = e.unwrap(bbd, bbs); - assertEquals(res.bytesConsumed(), 1); - assertEquals(res.bytesProduced(), 2); + assertEquals(1, res.bytesConsumed()); + assertEquals(2, res.bytesProduced()); try { e.unwrap(bbs, new ByteBuffer[] { bbd }); @@ -345,8 +345,8 @@ } catch (SSLException ex) { } res = e.unwrap(bbd, new ByteBuffer[] { bbs }); - assertEquals(res.bytesConsumed(), 1); - assertEquals(res.bytesProduced(), 2); + assertEquals(1, res.bytesConsumed()); + assertEquals(2, res.bytesProduced()); } /** @@ -361,8 +361,8 @@ SSLEngine e = new mySSLEngine(host, port); SSLEngineResult res = e.unwrap(bb, ByteBuffer.allocate(10)); - assertEquals(res.bytesConsumed(), 1); - assertEquals(res.bytesProduced(), 2); + assertEquals(1, res.bytesConsumed()); + assertEquals(2, res.bytesProduced()); } /** @@ -380,8 +380,8 @@ SSLEngine e = new mySSLEngine(host, port); SSLEngineResult res = e.unwrap(bb, bbA); - assertEquals(res.bytesConsumed(), 1); - assertEquals(res.bytesProduced(), 2); + assertEquals(1, res.bytesConsumed()); + assertEquals(2, res.bytesProduced()); } } Index: modules/sql/src/test/java/tests/api/java/sql/BatchUpdateExceptionTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/BatchUpdateExceptionTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/BatchUpdateExceptionTest.java (working copy) @@ -39,7 +39,7 @@ try { aBatchUpdateException = new BatchUpdateException(); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); @@ -83,7 +83,7 @@ try { aBatchUpdateException = new BatchUpdateException(init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); @@ -136,7 +136,7 @@ aBatchUpdateException = new BatchUpdateException(init1[i], init2[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); @@ -191,7 +191,7 @@ aBatchUpdateException = new BatchUpdateException(init1[i], init2[i], init3[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); @@ -247,7 +247,7 @@ aBatchUpdateException = new BatchUpdateException(init1[i], init2[i], init3[i], init4[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch: ", aBatchUpdateException.getErrorCode(), theFinalStates1[i]); Index: modules/sql/src/test/java/tests/api/java/sql/DateTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/DateTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/DateTest.java (working copy) @@ -180,7 +180,7 @@ // If it worked, it should get the Hours setting assertTrue(theHours == 23); - assertTrue(false); + fail(); } catch (IllegalArgumentException ie) { /* * System.out.println("getHours: IllegalArgumentException thrown as @@ -201,7 +201,7 @@ // If it worked, it should get the Hours setting assertTrue(theMinutes == 59); - assertTrue(false); + fail(); } catch (IllegalArgumentException ie) { /* * System.out.println("getMinutes: IllegalArgumentException thrown @@ -222,7 +222,7 @@ // If it worked, it should get the Hours setting assertTrue(theSeconds == 23); - assertTrue(false); + fail(); } catch (IllegalArgumentException ie) { /* * System.out.println("getSeconds: IllegalArgumentException thrown @@ -242,7 +242,7 @@ theDate.setHours(22); // If it worked, this is incorrect - assertTrue(false); + fail(); } catch (IllegalArgumentException ie) { /* * System.out.println("setHours: IllegalArgumentException thrown as @@ -262,7 +262,7 @@ theDate.setMinutes(54); // If it worked, this is incorrect - assertTrue(false); + fail(); } catch (IllegalArgumentException ie) { /* * System.out.println("setMinutes: IllegalArgumentException thrown @@ -283,7 +283,7 @@ theDate.setSeconds(36); // If it worked, this is incorrect - assertTrue(false); + fail(); } catch (IllegalArgumentException ie) { /* * System.out.println("setSeconds: IllegalArgumentException thrown @@ -377,7 +377,7 @@ try { theDate = Date.valueOf(SQL_INVALIDARRAY[i]); // Shouldn't get here - assertTrue(false); + fail(); } catch (Exception e) { // System.out.println("DateTest.testValueOf: Exception thrown: " // + e.toString() ); Index: modules/sql/src/test/java/tests/api/java/sql/SQLWarningTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/SQLWarningTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/SQLWarningTest.java (working copy) @@ -39,7 +39,7 @@ try { aSQLWarning = new SQLWarning(); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLWarning .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLWarning @@ -84,7 +84,7 @@ try { aSQLWarning = new SQLWarning(init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLWarning .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLWarning @@ -131,7 +131,7 @@ try { aSQLWarning = new SQLWarning(init1[i], init2[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLWarning .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLWarning @@ -181,7 +181,7 @@ try { aSQLWarning = new SQLWarning(init1[i], init2[i], init3[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLWarning .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLWarning Index: modules/sql/src/test/java/tests/api/java/sql/TimeTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/TimeTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/TimeTest.java (working copy) @@ -132,7 +132,7 @@ try { theReturn = Time.valueOf(parm1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertTrue(theReturn.equals(theReturns[i])); } catch (Exception e) { assertTrue(e.getClass().equals(theExceptions[i].getClass())); @@ -162,7 +162,7 @@ try { theTime.setDate(10); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testSetDate: IllegalArgumentException thrown @@ -176,7 +176,7 @@ try { theTime.setMonth(2); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testSetMonth: IllegalArgumentException thrown @@ -190,7 +190,7 @@ try { theTime.setYear(99); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testSetYear: IllegalArgumentException thrown @@ -204,7 +204,7 @@ try { int theDate = theTime.getDate(); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testGetDate: IllegalArgumentException thrown @@ -218,7 +218,7 @@ try { int theDay = theTime.getDay(); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testGetDay: IllegalArgumentException thrown @@ -232,7 +232,7 @@ try { int theDate = theTime.getMonth(); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testGetMonth: IllegalArgumentException thrown @@ -246,7 +246,7 @@ try { int theDate = theTime.getYear(); - assertTrue(false); + fail(); } catch (Exception e) { /* * System.out.println("testGetYear: IllegalArgumentException thrown Index: modules/sql/src/test/java/tests/api/java/sql/TimestampTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/TimestampTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/TimestampTest.java (working copy) @@ -296,7 +296,7 @@ for (int i = 0; i < INVALID_STRINGS.length; i++) { try { Timestamp theTimestamp2 = Timestamp.valueOf(INVALID_STRINGS[i]); - assertTrue(false); + fail(); } catch (IllegalArgumentException e) { /* * System.out.println("testValueOfString: exception message: " + @@ -356,7 +356,7 @@ try { theReturn = Timestamp.valueOf(parm1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Times do not match: ", theReturn.getTime(), theReturnTime[i]); assertEquals(i + " Nanos do not match: ", theReturn.getNanos(), @@ -366,8 +366,9 @@ assertEquals(i + " Unexpected exception: ", e.getClass(), theExceptions[i].getClass()); } else { - assertEquals(i + " Exception when none expected: ", e - .getClass(), null); + fail(i + + " Exception when none expected: " + + e.getClass()); } // end if } // end try } // end for Index: modules/sql/src/test/java/tests/api/java/sql/SQLExceptionTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/SQLExceptionTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/SQLExceptionTest.java (working copy) @@ -70,7 +70,7 @@ try { aSQLException = new SQLException(init1[i], init2[i], init3[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLException .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLException @@ -118,7 +118,7 @@ try { aSQLException = new SQLException(init1[i], init2[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLException .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLException @@ -164,7 +164,7 @@ try { aSQLException = new SQLException(init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLException .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLException @@ -204,7 +204,7 @@ try { aSQLException = new SQLException(); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aSQLException .getMessage(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aSQLException Index: modules/sql/src/test/java/tests/api/java/sql/DataTruncationTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/DataTruncationTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/DataTruncationTest.java (working copy) @@ -56,7 +56,7 @@ aDataTruncation = new DataTruncation(init1[i], init2[i], init3[i], init4[i], init5[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aDataTruncation .getSQLState(), theFinalStates1[i]); assertEquals(i + " Final state mismatch", aDataTruncation Index: modules/sql/src/test/java/tests/api/java/sql/DriverManagerTest.java =================================================================== --- modules/sql/src/test/java/tests/api/java/sql/DriverManagerTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/java/sql/DriverManagerTest.java (working copy) @@ -196,7 +196,7 @@ theConnection = DriverManager.getConnection(validConnectionURL); assertTrue(theConnection != null); } catch (SQLException e) { - assertTrue(false); + fail(); } // end try // invalid connections @@ -251,7 +251,7 @@ theConnection = DriverManager.getConnection(validURL1, validProps); assertTrue(theConnection != null); } catch (SQLException e) { - assertTrue(false); + fail(); } // end try // invalid Connections @@ -301,7 +301,7 @@ validpassword1); assertTrue(theConnection != null); } catch (SQLException e) { - assertTrue(false); + fail(); } // end try // invalid Connections Index: modules/sql/src/test/java/tests/api/javax/transaction/TransactionRequiredExceptionTest.java =================================================================== --- modules/sql/src/test/java/tests/api/javax/transaction/TransactionRequiredExceptionTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/javax/transaction/TransactionRequiredExceptionTest.java (working copy) @@ -40,7 +40,7 @@ aTransactionRequiredException = new TransactionRequiredException( init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aTransactionRequiredException.getMessage(), theFinalStates1[i]); @@ -72,7 +72,7 @@ try { aTransactionRequiredException = new TransactionRequiredException(); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aTransactionRequiredException.getMessage(), theFinalStates1[i]); Index: modules/sql/src/test/java/tests/api/javax/transaction/TransactionRolledbackExceptionTest.java =================================================================== --- modules/sql/src/test/java/tests/api/javax/transaction/TransactionRolledbackExceptionTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/javax/transaction/TransactionRolledbackExceptionTest.java (working copy) @@ -40,7 +40,7 @@ aTransactionRolledbackException = new TransactionRolledbackException( init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aTransactionRolledbackException.getMessage(), theFinalStates1[i]); @@ -72,7 +72,7 @@ try { aTransactionRolledbackException = new TransactionRolledbackException(); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aTransactionRolledbackException.getMessage(), theFinalStates1[i]); Index: modules/sql/src/test/java/tests/api/javax/transaction/xa/XAExceptionTest.java =================================================================== --- modules/sql/src/test/java/tests/api/javax/transaction/xa/XAExceptionTest.java (revision 394268) +++ modules/sql/src/test/java/tests/api/javax/transaction/xa/XAExceptionTest.java (working copy) @@ -138,7 +138,7 @@ try { aXAException = new XAException(init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aXAException .getMessage(), theFinalStates1[i]); @@ -172,7 +172,7 @@ try { aXAException = new XAException(init1[i]); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aXAException .getMessage(), theFinalStates1[i]); @@ -203,7 +203,7 @@ try { aXAException = new XAException(); if (theExceptions[i] != null) - assertTrue(false); + fail(); assertEquals(i + " Final state mismatch", aXAException .getMessage(), theFinalStates1[i]); Index: modules/sql/src/test/java/tests/api/javax/transaction/InvalidTransactionExceptionTest.java =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java =================================================================== --- modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java (revision 394268) +++ modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java (working copy) @@ -892,12 +892,12 @@ // Testing: Object[] Set.toArray() // public void testToArray_EmptySet() { - assertEquals("Set is empty", set.toArray().length, 0); + assertEquals("Set is empty", 0, set.toArray().length); } public void testToArray_NotEmptySet() { set.add(element); - assertEquals("Set is not empty", set.toArray().length, 1); + assertEquals("Set is not empty", 1, set.toArray().length); assertTrue("Set element", set.toArray()[0] == element); } @@ -1419,7 +1419,7 @@ set.add(element); setReadOnly(); - assertEquals("Set is not empty", set.toArray().length, 1); + assertEquals("Set is not empty", 1, set.toArray().length); assertTrue("Set element", set.toArray()[0] == element); } } @@ -1699,7 +1699,7 @@ set.add(element); setSecure(); - assertEquals("Set is not empty", set.toArray().length, 1); + assertEquals("Set is not empty", 1, set.toArray().length); assertTrue("Set element", set.toArray()[0] == element); } } Index: modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java =================================================================== --- modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java (revision 394268) +++ modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java (working copy) @@ -149,7 +149,7 @@ public void testGetMinorString() { MessageProp mp= new MessageProp(true); String s= mp.getMinorString(); - assertEquals(null, s); + assertNull(s); } public void testGetMinorString_0() { Index: modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java (working copy) @@ -96,7 +96,7 @@ public void testGetMinorString() { GSSException gssException= new GSSException(GSSException.BAD_NAME); String minorString= gssException.getMinorString(); - assertEquals(null, minorString ); + assertNull(minorString); } public void testGetMinorString_0() { @@ -114,14 +114,14 @@ public void testGetMinorString_2() { GSSException gssException= new GSSException(GSSException.BAD_NAME, 0, "Bad day today"); String minorString= gssException.getMinorString(); - assertEquals(null, minorString ); + assertNull(minorString); } public void testGetMinorString_3() { GSSException gssException= new GSSException(GSSException.BAD_NAME); gssException.setMinor(0, "Bad day today"); String minorString= gssException.getMinorString(); - assertEquals(null, minorString ); + assertNull(minorString); } public void testGetMessage() { Index: modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java (working copy) @@ -74,9 +74,9 @@ assertEquals("CN=A, CN=B, CN=A, CN=B", s); byte[] restBytes = new byte[] { 0, 0, 0 }; is.read(restBytes); - assertEquals(restBytes[0], 1); - assertEquals(restBytes[1], 2); - assertEquals(restBytes[2], 3); + assertEquals(1, restBytes[0]); + assertEquals(2, restBytes[1]); + assertEquals(3, restBytes[2]); is.close(); } @@ -2786,4 +2786,4 @@ new byte[] { mask } }); } } -} \ No newline at end of file +} Index: modules/auth/src/test/java/common/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java (working copy) @@ -73,8 +73,8 @@ */ public final void testUnsupportedCallbackException_03() { UnsupportedCallbackException ce = new UnsupportedCallbackException(null, null); - assertEquals (null, ce.getMessage()); - assertEquals(null, ce.getCallback()); + assertNull(ce.getMessage()); + assertNull(ce.getCallback()); try { throw ce; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/DestroyFailedExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/DestroyFailedExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/DestroyFailedExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testDestroyFailedException_01() { DestroyFailedException tE = new DestroyFailedException(); - assertEquals (null, tE.getMessage()); + assertNull( tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/PrivateCredentialPermissionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/PrivateCredentialPermissionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/PrivateCredentialPermissionTest.java (working copy) @@ -674,7 +674,7 @@ PrivateCredentialPermission p = new PrivateCredentialPermission( "a b \"c\" b \"c\"", "read"); - assertEquals("Size", p.getPrincipals().length, 1); + assertEquals("Size", 1, p.getPrincipals().length); } public final void testImmutability() { Index: modules/auth/src/test/java/common/javax/security/auth/RefreshFailedExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/RefreshFailedExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/RefreshFailedExceptionTest.java (working copy) @@ -38,7 +38,7 @@ public final void testRefreshFailedException_01() { RefreshFailedException tE = new RefreshFailedException(); - assertEquals (null, tE.getMessage()); + assertNull( tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/CredentialNotFoundExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/CredentialNotFoundExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/CredentialNotFoundExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testCredentialNotFoundException_01() { CredentialNotFoundException tE = new CredentialNotFoundException(); - assertEquals (null, tE.getMessage()); + assertNull( tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/LoginExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/LoginExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/LoginExceptionTest.java (working copy) @@ -34,7 +34,7 @@ public final void testLoginException_01() { LoginException tE = new LoginException(); - assertEquals (null, tE.getMessage()); + assertNull( tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/AccountNotFoundExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/AccountNotFoundExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/AccountNotFoundExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testAccountNotFoundException_01() { AccountNotFoundException tE = new AccountNotFoundException(); - assertEquals (null, tE.getMessage()); + assertNull(tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/CredentialExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/CredentialExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/CredentialExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testCredentialException_01() { CredentialException tE = new CredentialException(); - assertEquals (null, tE.getMessage()); + assertNull(tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/CredentialExpiredExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/CredentialExpiredExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/CredentialExpiredExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testCredentialExpiredException_01() { CredentialExpiredException tE = new CredentialExpiredException(); - assertEquals (null, tE.getMessage()); + assertNull( tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/AccountExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/AccountExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/AccountExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testAccountException_01() { AccountException tE = new AccountException(); - assertEquals (null, tE.getMessage()); + assertNull(tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/AccountExpiredExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/AccountExpiredExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/AccountExpiredExceptionTest.java (working copy) @@ -36,7 +36,7 @@ public final void testAccountExpiredException_01() { AccountExpiredException tE = new AccountExpiredException(); - assertEquals (null, tE.getMessage()); + assertNull( tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/FailedLoginExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/FailedLoginExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/FailedLoginExceptionTest.java (working copy) @@ -34,7 +34,7 @@ public final void testFailedLoginException_01() { FailedLoginException tE = new FailedLoginException(); - assertEquals (null, tE.getMessage()); + assertNull(tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/auth/login/AccountLockedExceptionTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/auth/login/AccountLockedExceptionTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/auth/login/AccountLockedExceptionTest.java (working copy) @@ -35,7 +35,7 @@ public final void testAccountLockedException_01() { AccountLockedException tE = new AccountLockedException(); - assertEquals (null, tE.getMessage()); + assertNull(tE.getMessage()); try { throw tE; }catch (Exception e){ Index: modules/auth/src/test/java/common/javax/security/sasl/AuthorizeCallbackTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/sasl/AuthorizeCallbackTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/sasl/AuthorizeCallbackTest.java (working copy) @@ -55,7 +55,7 @@ auth.setAuthorizedID("ZZZ"); auth.setAuthorized(true); - assertEquals(auth.getAuthorizedID(), "ZZZ"); + assertEquals("ZZZ", auth.getAuthorizedID()); assertNull(auth.getAuthorizationID()); assertTrue(auth.isAuthorized()); } Index: modules/auth/src/test/java/common/javax/security/sasl/RealmChoiceCallbackTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/sasl/RealmChoiceCallbackTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/sasl/RealmChoiceCallbackTest.java (working copy) @@ -143,7 +143,7 @@ for (int j = 0; j < indexes.length; j++) { rCCB.setSelectedIndex(indexes[j]); ind = rCCB.getSelectedIndexes(); - assertEquals("Incorrect index length", ind.length, 1); + assertEquals("Incorrect index length", 1, ind.length); assertEquals("Incorrect index", ind[0], indexes[j]); } } @@ -179,7 +179,7 @@ for (int j = indexes.length - 1; j >= 0; j--) { rCCB.setSelectedIndex(indexes[j]); ind = rCCB.getSelectedIndexes(); - assertEquals("Incorrect index length", ind.length, 1); + assertEquals("Incorrect index length", 1, ind.length); assertEquals("Incorrect index", ind[0], indexes[j]); } rCCB.setSelectedIndexes(indexes); Index: modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java =================================================================== --- modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java (revision 394268) +++ modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java (working copy) @@ -82,8 +82,8 @@ // assertNull("tIn is not null", tIn); // if (!all) { - assertEquals("Incorrect length in ", in.length, 1); - assertEquals("Incorrect length tIn ", tIn.length, 1); + assertEquals("Incorrect length in ", 1, in.length); + assertEquals("Incorrect length tIn ", 1, tIn.length); assertEquals("Incorrect index", in[0], tIn[0]); } else { assertEquals("Incorrect length", in.length, tIn.length); @@ -97,4 +97,4 @@ public static void main(String[] args) { junit.textui.TestRunner.run(RealmChoiceCallbackTest.class); } -} \ No newline at end of file +} Index: modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java (working copy) @@ -380,9 +380,7 @@ groupSockAddr = new InetSocketAddress(InetAddress .getByName("255.255.255.255"), groupPort); mss.joinGroup(groupSockAddr, null); - assertFalse( - "Did not get exception when group is not a multicast address", - true); + fail("Did not get exception when group is not a multicast address"); } catch (IOException e) { } @@ -394,9 +392,7 @@ group = InetAddress.getByName("224.0.0.3"); groupSockAddr = new InetSocketAddress(group, groupPort); mss.joinGroup(groupSockAddr, null); - assertFalse( - "Did not get exception when joining group is not allowed", - true); + fail("Did not get exception when joining group is not allowed"); } catch (SecurityException e) { } System.setSecurityManager(null); @@ -641,9 +637,7 @@ group = InetAddress.getByName("255.255.255.255"); groupSockAddr = new InetSocketAddress(group, groupPort); mss.leaveGroup(groupSockAddr, null); - assertFalse( - "Did not get exception when group is not a multicast address", - true); + fail("Did not get exception when group is not a multicast address"); } catch (IOException e) { } @@ -655,9 +649,7 @@ group = InetAddress.getByName("224.0.0.3"); groupSockAddr = new InetSocketAddress(group, groupPort); mss.leaveGroup(groupSockAddr, null); - assertFalse( - "Did not get exception when joining group is not allowed", - true); + fail("Did not get exception when joining group is not allowed"); } catch (SecurityException e) { } System.setSecurityManager(null); Index: modules/luni/src/test/java/tests/api/java/net/ServerSocketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/ServerSocketTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/ServerSocketTest.java (working copy) @@ -417,9 +417,7 @@ Support_PortManager.getNextPort()); theSocket.bind(theAddress); theSocket2.bind(theAddress); - assertFalse( - "No exception binding to address that is not available", - true); + fail("No exception binding to address that is not available"); } catch (IOException ex) { } theSocket.close(); @@ -444,9 +442,7 @@ theSocket = new ServerSocket(); try { theSocket.bind(new mySocketAddress()); - assertFalse( - "No exception when binding using unsupported SocketAddress subclass", - true); + fail("No exception when binding using unsupported SocketAddress subclass"); } catch (IllegalArgumentException ex) { } theSocket.close(); @@ -508,9 +504,7 @@ Support_PortManager.getNextPort()); theSocket.bind(theAddress, 5); theSocket2.bind(theAddress, 5); - assertFalse( - "No exception binding to address that is not available", - true); + fail("No exception binding to address that is not available"); } catch (IOException ex) { } theSocket.close(); @@ -872,10 +866,10 @@ // since the value returned is not necessary what we set we are // limited in what we can test // just validate that it is not 0 or negative - assertFalse("get Buffer size returns 0:", 0 == theSocket - .getReceiveBufferSize()); - assertFalse("get Buffer size returns a negative value:", - 0 > theSocket.getReceiveBufferSize()); + assertFalse("get Buffer size returns 0:", + 0 == theSocket.getReceiveBufferSize()); + assertFalse("get Buffer size returns a negative value:", + 0 > theSocket.getReceiveBufferSize()); ensureExceptionThrownIfOptionIsUnsupportedOnOS(SO_RCVBUF); } catch (Exception e) { handleException(e, SO_RCVBUF); Index: modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java (working copy) @@ -361,7 +361,7 @@ List header = (List) headers.get("whatever"); assertNotNull(header); - assertEquals(header.get(0), "you like"); + assertEquals("you like", header.get(0)); assertTrue(headers.size() >= 1); Index: modules/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java (working copy) @@ -300,9 +300,7 @@ try { DatagramPacket thePacket = new DatagramPacket(buf, 1, new mySocketAddress()); - assertFalse( - "No exception when constructing using unsupported SocketAddress subclass", - true); + fail("No exception when constructing using unsupported SocketAddress subclass"); } catch (IllegalArgumentException ex) { } @@ -311,9 +309,7 @@ try { DatagramPacket thePacket = new DatagramPacket(buf, 1, null); - assertFalse( - "No exception when constructing address using null", - true); + fail("No exception when constructing address using null"); } catch (IllegalArgumentException ex) { } @@ -348,9 +344,7 @@ try { DatagramPacket thePacket = new DatagramPacket(buf, 1, 1, new mySocketAddress()); - assertFalse( - "No exception when constructing using unsupported SocketAddress subclass", - true); + fail("No exception when constructing using unsupported SocketAddress subclass"); } catch (IllegalArgumentException ex) { } @@ -359,9 +353,7 @@ try { DatagramPacket thePacket = new DatagramPacket(buf, 1, 1, null); - assertFalse( - "No exception when constructing address using null", - true); + fail("No exception when constructing address using null"); } catch (IllegalArgumentException ex) { } @@ -418,9 +410,7 @@ DatagramPacket thePacket = new DatagramPacket(buf, 1); try { thePacket.setSocketAddress(new mySocketAddress()); - assertFalse( - "No exception when setting address using unsupported SocketAddress subclass", - true); + fail("No exception when setting address using unsupported SocketAddress subclass"); } catch (IllegalArgumentException ex) { } @@ -429,8 +419,7 @@ thePacket = new DatagramPacket(buf, 1); try { thePacket.setSocketAddress(null); - assertFalse("No exception when setting address using null", - true); + fail("No exception when setting address using null"); } catch (IllegalArgumentException ex) { } Index: modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java (working copy) @@ -106,7 +106,7 @@ List newHeader = (List) headers.get("whatever"); assertNotNull(newHeader); - assertEquals(newHeader.get(0), "you like"); + assertEquals("you like", newHeader.get(0)); try { // the map should be unmodifiable Index: modules/luni/src/test/java/tests/api/java/net/SocketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/SocketTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/SocketTest.java (working copy) @@ -1159,8 +1159,8 @@ InetAddress .getByAddress(Support_Configuration.nonLocalAddressBytes), Support_PortManager.getNextPort())); - assertFalse("No exception when binding to bad address:" - + theSocket.getLocalSocketAddress().toString(), true); + fail("No exception when binding to bad address:" + + theSocket.getLocalSocketAddress().toString()); } catch (IOException ex) { } theSocket.close(); @@ -1222,9 +1222,7 @@ Support_PortManager.getNextPort()); theSocket.bind(theAddress); theSocket2.bind(theAddress); - assertFalse( - "No exception binding to address that is not available", - true); + fail("No exception binding to address that is not available"); } catch (IOException ex) { } theSocket.close(); Index: modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java (working copy) @@ -1101,9 +1101,7 @@ .getNextPort()); theSocket.bind(theAddress); theSocket2.bind(theAddress); - assertFalse( - "No exception binding to address that is not available", - true); + fail("No exception binding to address that is not available"); } catch (SocketException ex) { } theSocket.close(); @@ -1113,9 +1111,7 @@ theSocket = new DatagramSocket(null); try { theSocket.bind(new mySocketAddress()); - assertFalse( - "No exception when binding using unsupported SocketAddress subclass", - true); + fail("No exception when binding using unsupported SocketAddress subclass"); } catch (IllegalArgumentException ex) { } theSocket.close(); Index: modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java (working copy) @@ -137,9 +137,9 @@ // one with Korean country but an India language // this method should return the currency codes in that case Locale.setDefault(new Locale("kr", "KR")); - assertEquals("currK.getSymbol()", currK.getSymbol(), "KRW"); - assertEquals("currI.getSymbol()", currI.getSymbol(), "INR"); - assertEquals("currUS.getSymbol()", currUS.getSymbol(), "USD"); + assertEquals("currK.getSymbol()", "KRW", currK.getSymbol()); + assertEquals("currI.getSymbol()", "INR", currI.getSymbol()); + assertEquals("currUS.getSymbol()", "USD", currUS.getSymbol()); } /** Index: modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java (working copy) @@ -40,7 +40,7 @@ al.add(three); al.add(four); List sub = al.subList(1, 3); - assertEquals(sub.size(), 2); + assertEquals(2, sub.size()); // the sub.get(1) is 3.0 assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0); assertTrue(((Double) sub.get(1)).doubleValue() > 2.0); @@ -70,7 +70,7 @@ al.add(three); al.add(four); List sub = al.subList(1, 3); - assertEquals(sub.size(), 2); + assertEquals(2, sub.size()); // the sub.get(1) is 3.0 assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0); assertTrue(((Double) sub.get(1)).doubleValue() > 2.0); @@ -100,7 +100,7 @@ al.add(three); al.add(four); List sub = al.subList(1, 3); - assertEquals(sub.size(), 2); + assertEquals(2, sub.size()); // the sub.get(1) is 3.0 assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0); assertTrue(((Double) sub.get(1)).doubleValue() > 2.0); @@ -130,7 +130,7 @@ al.add(three); al.add(four); List sub = al.subList(1, 3); - assertEquals(sub.size(), 2); + assertEquals(2, sub.size()); // the sub.get(1) is 3.0 assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0); assertTrue(((Double) sub.get(1)).doubleValue() > 2.0); @@ -160,7 +160,7 @@ al.add(three); al.add(four); List sub = al.subList(1, 3); - assertEquals(sub.size(), 2); + assertEquals(2, sub.size()); // the sub.get(1) is 3.0 assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0); assertTrue(((Double) sub.get(1)).doubleValue() > 2.0); Index: modules/luni/src/test/java/tests/api/java/util/TimeZoneTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/util/TimeZoneTest.java (revision 394268) +++ modules/luni/src/test/java/tests/api/java/util/TimeZoneTest.java (working copy) @@ -101,70 +101,70 @@ public void test_getTimeZoneLjava_lang_String() { assertEquals( "Must return GMT when given an invalid TimeZone id SMT-8.", - TimeZone.getTimeZone("SMT-8").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("SMT-8").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+28:70.", - TimeZone.getTimeZone("GMT+28:70").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+28:70").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+28:30.", - TimeZone.getTimeZone("GMT+28:30").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+28:30").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+8:70.", - TimeZone.getTimeZone("GMT+8:70").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+8:70").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+3:.", - TimeZone.getTimeZone("GMT+3:").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+3:").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+3:0.", - TimeZone.getTimeZone("GMT+3:0").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+3:0").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+2360.", - TimeZone.getTimeZone("GMT+2360").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+2360").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+892.", - TimeZone.getTimeZone("GMT+892").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+892").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+082.", - TimeZone.getTimeZone("GMT+082").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+082").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+28.", - TimeZone.getTimeZone("GMT+28").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+28").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT+30.", - TimeZone.getTimeZone("GMT+30").getID(), "GMT"); - assertEquals("Must return GMT when given TimeZone GMT.", TimeZone - .getTimeZone("GMT").getID(), "GMT"); - assertEquals("Must return GMT when given TimeZone GMT+.", TimeZone - .getTimeZone("GMT+").getID(), "GMT"); - assertEquals("Must return GMT when given TimeZone GMT-.", TimeZone - .getTimeZone("GMT-").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT+30").getID()); + assertEquals("Must return GMT when given TimeZone GMT.", + "GMT", TimeZone.getTimeZone("GMT").getID()); + assertEquals("Must return GMT when given TimeZone GMT+.", + "GMT", TimeZone.getTimeZone("GMT+").getID()); + assertEquals("Must return GMT when given TimeZone GMT-.", + "GMT", TimeZone.getTimeZone("GMT-").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT-8.45.", - TimeZone.getTimeZone("GMT-8.45").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT-8.45").getID()); assertEquals( "Must return GMT when given an invalid TimeZone time GMT-123:23.", - TimeZone.getTimeZone("GMT-123:23").getID(), "GMT"); + "GMT", TimeZone.getTimeZone("GMT-123:23").getID()); assertEquals( "Must return proper GMT formatted string for GMT+8:30 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT+8:30").getID(), "GMT+08:30"); + "GMT+08:30", TimeZone.getTimeZone("GMT+8:30").getID()); assertEquals( "Must return proper GMT formatted string for GMT+3 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT+3").getID(), "GMT+03:00"); + "GMT+03:00", TimeZone.getTimeZone("GMT+3").getID()); assertEquals( "Must return proper GMT formatted string for GMT+3:02 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT+3:02").getID(), "GMT+03:02"); + "GMT+03:02", TimeZone.getTimeZone("GMT+3:02").getID()); assertEquals( "Must return proper GMT formatted string for GMT+2359 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT+2359").getID(), "GMT+23:59"); + "GMT+23:59", TimeZone.getTimeZone("GMT+2359").getID()); assertEquals( "Must return proper GMT formatted string for GMT+520 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT+520").getID(), "GMT+05:20"); + "GMT+05:20", TimeZone.getTimeZone("GMT+520").getID()); assertEquals( "Must return proper GMT formatted string for GMT+052 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT+052").getID(), "GMT+00:52"); + "GMT+00:52", TimeZone.getTimeZone("GMT+052").getID()); assertEquals( "Must return proper GMT formatted string for GMT-0 (eg. GMT+08:20).", - TimeZone.getTimeZone("GMT-0").getID(), "GMT-00:00"); + "GMT-00:00", TimeZone.getTimeZone("GMT-0").getID()); } /** Index: modules/luni/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java =================================================================== --- modules/luni/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java (revision 394268) +++ modules/luni/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java (working copy) @@ -37,7 +37,7 @@ fail("Should not throw IOException"); } String result = out.getEncoding(); - assertEquals(null, result); + assertNull(result); } public void testGetEncoding_NotHistorical() { @@ -49,7 +49,7 @@ // ok } String result = out.getEncoding(); - assertEquals(result, "UnicodeBigUnmarked"); + assertEquals("UnicodeBigUnmarked", result); } } \ No newline at end of file Index: modules/luni/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java =================================================================== --- modules/luni/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java (revision 394268) +++ modules/luni/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java (working copy) @@ -37,7 +37,7 @@ fail("Should not throw IOException"); } String result = in.getEncoding(); - assertEquals(null, result); + assertNull(result); } public void testGetEncoding_NotHistorical() { @@ -48,7 +48,7 @@ // ok } String result = in.getEncoding(); - assertEquals(result, "UnicodeBigUnmarked"); + assertEquals("UnicodeBigUnmarked", result); } } \ No newline at end of file Index: modules/security/src/test/java/common/java/security/KeyStore3Test.java =================================================================== --- modules/security/src/test/java/common/java/security/KeyStore3Test.java (revision 394268) +++ modules/security/src/test/java/common/java/security/KeyStore3Test.java (working copy) @@ -254,7 +254,7 @@ new KeyStore.PasswordProtection(new char[0])); for (int i = 0; i < kss.length; i++) { kss[i].load(lParam); - assertEquals("Incorrect result", kss[i].size(), 0); + assertEquals("Incorrect result", 0, kss[i].size()); kss[i].store(lParam); } } Index: modules/security/src/test/java/common/java/security/KSBuilderTest.java =================================================================== --- modules/security/src/test/java/common/java/security/KSBuilderTest.java (revision 394268) +++ modules/security/src/test/java/common/java/security/KSBuilderTest.java (working copy) @@ -192,7 +192,7 @@ ks.load(null, pass); ksB = KeyStore.Builder.newInstance(ks, pp[i]); - assertEquals("Incorrect KeyStore", ksB.getKeyStore().size(), 0); + assertEquals("Incorrect KeyStore", 0, ksB.getKeyStore().size()); ks.setEntry("aaa", pKey, pp[0]); ksB = KeyStore.Builder.newInstance(ks, pp[i]); @@ -353,7 +353,7 @@ if (i == 2) { fail("KeyStoreException must be thrown for incorrect ProtectionParameter"); } else { - assertEquals("Incorrect KeyStore size", ks.size(), 0); + assertEquals("Incorrect KeyStore size", 0, ks.size()); } } catch (KeyStoreException e) { if (i == 2) { Index: modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java =================================================================== --- modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java (revision 394268) +++ modules/security/src/test/java/common/java/security/KeyPairGeneratorSpiTest.java (working copy) @@ -68,8 +68,8 @@ keyPairGen.initialize(1024, null); fail("IllegalArgumentException must be thrown"); } catch (IllegalArgumentException e) { - assertEquals("Incorrect exception", e.getMessage(), - "Invalid random"); + assertEquals("Incorrect exception", + "Invalid random", e.getMessage()); } KeyPair kp = keyPairGen.generateKeyPair(); assertNull("Not null KeyPair", kp); Index: modules/security/src/test/java/common/java/security/KeyPairGenerator2Test.java =================================================================== --- modules/security/src/test/java/common/java/security/KeyPairGenerator2Test.java (revision 394268) +++ modules/security/src/test/java/common/java/security/KeyPairGenerator2Test.java (working copy) @@ -99,15 +99,15 @@ keyPairGen.initialize(-1024, new SecureRandom()); fail("InvalidParameterException must be thrown"); } catch (InvalidParameterException e) { - assertEquals("Incorrect exception", e.getMessage(), - "Incorrect keysize parameter"); + assertEquals("Incorrect exception", + "Incorrect keysize parameter", e.getMessage()); } try { keyPairGen.initialize(100, null); fail("InvalidParameterException must be thrown"); } catch (InvalidParameterException e) { - assertEquals("Incorrect exception", e.getMessage(), - "Incorrect random"); + assertEquals("Incorrect exception", + "Incorrect random", e.getMessage()); } keyPairGen.generateKeyPair(); keyPairGen.genKeyPair(); Index: modules/security/src/test/java/common/java/security/cert/X509CRLTest.java =================================================================== --- modules/security/src/test/java/common/java/security/cert/X509CRLTest.java (revision 394268) +++ modules/security/src/test/java/common/java/security/cert/X509CRLTest.java (working copy) @@ -150,7 +150,7 @@ */ public void testGetType() { assertEquals("The type of X509CRL should be X.509", - tbt_crl.getType(), "X.509"); + "X.509", tbt_crl.getType()); } /** Index: modules/security/src/test/java/common/java/security/cert/X509CertificateTest.java =================================================================== --- modules/security/src/test/java/common/java/security/cert/X509CertificateTest.java (revision 394268) +++ modules/security/src/test/java/common/java/security/cert/X509CertificateTest.java (working copy) @@ -173,7 +173,7 @@ */ public void testGetType() { assertEquals("The type of certificate should be X.509", - tbt_cert.getType(), "X.509"); + "X.509", tbt_cert.getType()); } /** Index: modules/security/src/test/java/common/java/security/cert/CertificateFactory3Test.java =================================================================== --- modules/security/src/test/java/common/java/security/cert/CertificateFactory3Test.java (revision 394268) +++ modules/security/src/test/java/common/java/security/cert/CertificateFactory3Test.java (working copy) @@ -143,7 +143,7 @@ col = certFs[i].generateCertificates(fis); fis.close(); Iterator it = col.iterator(); - assertEquals("Incorrect Collection size", col.size(), 1); + assertEquals("Incorrect Collection size", 1, col.size()); assertEquals("Incorect Certificate in Collection", cert, it.next()); } } Index: modules/security/src/test/java/common/java/security/cert/CertPathValidatorExceptionTest.java =================================================================== --- modules/security/src/test/java/common/java/security/cert/CertPathValidatorExceptionTest.java (revision 394268) +++ modules/security/src/test/java/common/java/security/cert/CertPathValidatorExceptionTest.java (working copy) @@ -255,7 +255,7 @@ assertNull("getMessage() must return null", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); assertNull("getCertPath() must return null", tE.getCertPath()); - assertEquals("getIndex() must be -1", tE.getIndex(), -1); + assertEquals("getIndex() must be -1", -1, tE.getIndex()); try { throw tE; } catch (Exception e) { @@ -314,7 +314,7 @@ assertEquals("getCause() must return " .concat(tCause.toString()), tE.getCause(), tCause); assertNull("getCertPath() must return null", tE.getCertPath()); - assertEquals("getIndex() must return -1", tE.getIndex(), -1); + assertEquals("getIndex() must return -1", -1, tE.getIndex()); try { throw tE; } catch (Exception e) { @@ -388,7 +388,7 @@ assertEquals( "getCertPath() must return ".concat(cp.toString()), tE .getCertPath(), cp); - assertEquals("getIndex() must return -1", tE.getIndex(), -1); + assertEquals("getIndex() must return -1", -1, tE.getIndex()); try { throw tE; } catch (Exception e) { Index: modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java =================================================================== --- modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java (revision 394268) +++ modules/security/src/test/java/common/java/security/cert/CertPathValidator1Test.java (working copy) @@ -374,8 +374,8 @@ } catch (CertPathValidatorException e) { } certPV = new myCertPathValidator(null, null, null); - assertEquals("Incorrect algorithm", certPV.getAlgorithm(), null); - assertEquals("Incorrect provider", certPV.getProvider(), null); + assertNull("Incorrect algorithm", certPV.getAlgorithm()); + assertNull("Incorrect provider", certPV.getProvider()); try { certPV.validate(null, null); fail("NullPointerException must be thrown"); Index: modules/security/src/test/java/common/java/security/cert/X509CertSelectorTest.java =================================================================== --- modules/security/src/test/java/common/java/security/cert/X509CertSelectorTest.java (revision 394268) +++ modules/security/src/test/java/common/java/security/cert/X509CertSelectorTest.java (working copy) @@ -1260,7 +1260,7 @@ PublicKey result = selector.getSubjectPublicKey(); assertEquals("The name of algorithm should be RSA", - result.getAlgorithm(), "RSA"); + "RSA", result.getAlgorithm()); } /** @@ -1347,7 +1347,7 @@ PublicKey result = selector.getSubjectPublicKey(); assertEquals("The name of algorithm should be RSA", - result.getAlgorithm(), "RSA"); + "RSA", result.getAlgorithm()); } /** @@ -2311,7 +2311,7 @@ X509CertSelector selector = new X509CertSelector(); assertEquals("Selector should return -1", - selector.getBasicConstraints(), -1); + -1, selector.getBasicConstraints()); selector.setBasicConstraints(plen1); assertEquals("The returned value should be equal to specified", plen1, selector.getBasicConstraints()); Index: modules/security/src/test/java/common/java/security/KeyStore1Test.java =================================================================== --- modules/security/src/test/java/common/java/security/KeyStore1Test.java (revision 394268) +++ modules/security/src/test/java/common/java/security/KeyStore1Test.java (working copy) @@ -953,7 +953,7 @@ assertEquals("Incorrect certificate", cc[t], certs[t]); } } - assertEquals(kss[i].getCertificateAlias(cert), null); + assertNull(kss[i].getCertificateAlias(cert)); String ss = kss[i].getCertificateAlias(certs[0]); boolean ans = false; for (int j = 1; j < aliases.length; j++) { @@ -1011,7 +1011,7 @@ kss[i].setCertificateEntry(aliases[4], certs[0]); - assertEquals("Incorrect size", kss[i].size(), 5); + assertEquals("Incorrect size", 5, kss[i].size()); try { kss[i].deleteEntry(null); fail("NullPointerException should be thrown when alias is null"); @@ -1019,7 +1019,7 @@ } kss[i].deleteEntry(aliases[0]); kss[i].deleteEntry(aliases[3]); - assertEquals("Incorrect size", kss[i].size(), 3); + assertEquals("Incorrect size", 3, kss[i].size()); for (int j = 1; j < 5; j++) { if ((j == 0) || (j == 3)) { assertFalse("Incorrect deleted alias", kss[i] Index: modules/security/src/test/java/common/java/security/KeyStore2Test.java =================================================================== --- modules/security/src/test/java/common/java/security/KeyStore2Test.java (revision 394268) +++ modules/security/src/test/java/common/java/security/KeyStore2Test.java (working copy) @@ -99,16 +99,16 @@ .getCertificate(alias)); assertNull("getCertificateChain must return null", keyS .getCertificateChain(alias)); - assertEquals("Incorrect result of getCreationDate", keyS - .getCreationDate(alias), new Date(0)); - assertEquals("Incorrect result of size", keyS.size(), 0); + assertEquals("Incorrect result of getCreationDate", + new Date(0), keyS.getCreationDate(alias)); + assertEquals("Incorrect result of size", 0, keyS.size()); assertFalse("Incorrect result of isCertificateEntry", keyS .isCertificateEntry(alias)); assertFalse("Incorrect result of isKeyEntry", keyS.isKeyEntry(alias)); assertFalse("Incorrect result of containsAlias", keyS .containsAlias(alias)); - assertEquals("Incorrect result of getCertificateAlias", keyS - .getCertificateAlias(null), ""); + assertEquals("Incorrect result of getCertificateAlias", + "", keyS.getCertificateAlias(null)); try { keyS.setCertificateEntry(alias, null); fail("KeyStoreException must be thrown because this method is not supported"); Index: modules/security/src/test/java/common/tests/api/java/security/AlgorithmParametersTest.java =================================================================== --- modules/security/src/test/java/common/tests/api/java/security/AlgorithmParametersTest.java (revision 394268) +++ modules/security/src/test/java/common/tests/api/java/security/AlgorithmParametersTest.java (working copy) @@ -34,7 +34,7 @@ // Test for method java.lang.String // java.security.AlgorithmParameters.getAlgorithm() String alg = AlgorithmParameters.getInstance("DSA").getAlgorithm(); - assertEquals("algorithm name should be DSA", alg, "DSA"); + assertEquals("algorithm name should be DSA", "DSA", alg); } /** @@ -246,7 +246,7 @@ assertNull("toString should be null", str); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); - assertTrue("getInstance did not find algorithm", false); + fail("getInstance did not find algorithm"); } } } \ No newline at end of file Index: modules/security/src/test/java/common/tests/api/java/security/cert/CertificateFactoryTest.java =================================================================== --- modules/security/src/test/java/common/tests/api/java/security/cert/CertificateFactoryTest.java (revision 394268) +++ modules/security/src/test/java/common/tests/api/java/security/cert/CertificateFactoryTest.java (working copy) @@ -186,9 +186,9 @@ // java.security.cert.CertificateFactory.getInstance(java.lang.String) try { CertificateFactory fact = CertificateFactory.getInstance("X.509"); - assertTrue("factory is null", fact != null); + assertNotNull("factory is null", fact); } catch (CertificateException e) { - assertTrue("CertificateException in getInstance", false); + fail("CertificateException in getInstance"); } } Index: modules/security/src/test/java/common/javax/security/cert/X509CertificateTest.java =================================================================== --- modules/security/src/test/java/common/javax/security/cert/X509CertificateTest.java (revision 394268) +++ modules/security/src/test/java/common/javax/security/cert/X509CertificateTest.java (working copy) @@ -203,7 +203,7 @@ return; } assertEquals("The version is not correct.", - tbt_cert.getVersion(), 2); + 2, tbt_cert.getVersion()); } /** Index: modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java =================================================================== --- modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java (revision 394268) +++ modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java (working copy) @@ -59,75 +59,75 @@ public void testSplitCharSequenceint() { //splitting CharSequence which ends with pattern //bug6193 - assertEquals(",,".split(",", 3).length, 3); - assertEquals(",,".split(",", 4).length, 3); + assertEquals(3, ",,".split(",", 3).length); + assertEquals(3, ",,".split(",", 4).length); //bug6193 //bug5391 - assertEquals(Pattern.compile("o").split("boo:and:foo",5).length, 5); - assertEquals(Pattern.compile("b").split("ab", -1).length, 2); + assertEquals(5, Pattern.compile("o").split("boo:and:foo",5).length); + assertEquals(2, Pattern.compile("b").split("ab", -1).length); //bug5391 String s[]; Pattern pat = Pattern.compile("x"); s = pat.split("zxx:zzz:zxx",10); - assertEquals(s.length, 5); + assertEquals(5, s.length); s = pat.split("zxx:zzz:zxx",3); - assertEquals(s.length, 3); + assertEquals(3, s.length); s = pat.split("zxx:zzz:zxx",-1); - assertEquals(s.length, 5); + assertEquals(5, s.length); s = pat.split("zxx:zzz:zxx",0); - assertEquals(s.length, 3); + assertEquals(3, s.length); //other splitting //negative limit pat = Pattern.compile("b"); s = pat.split("abccbadfebb",-1); - assertEquals(s.length, 5); + assertEquals(5, s.length); s = pat.split("",-1); - assertEquals(s.length, 1); + assertEquals(1, s.length); pat = Pattern.compile(""); s = pat.split("",-1); - assertEquals(s.length, 1); + assertEquals(1, s.length); s = pat.split("abccbadfe", -1); - assertEquals(s.length, 11); + assertEquals(11, s.length); //zero limit pat = Pattern.compile("b"); s = pat.split("abccbadfebb", 0); - assertEquals(s.length, 3); + assertEquals(3, s.length); s = pat.split("", 0); - assertEquals(s.length, 1); + assertEquals(1, s.length); pat = Pattern.compile(""); s = pat.split("", 0); - assertEquals(s.length, 1); + assertEquals(1, s.length); s = pat.split("abccbadfe", 0); - assertEquals(s.length, 10); + assertEquals(10, s.length); //positive limit pat = Pattern.compile("b"); s = pat.split("abccbadfebb", 12); - assertEquals(s.length, 5); + assertEquals(5, s.length); s = pat.split("", 6); - assertEquals(s.length, 1); + assertEquals(1, s.length); pat = Pattern.compile(""); s = pat.split("", 11); - assertEquals(s.length, 1); + assertEquals(1, s.length); s = pat.split("abccbadfe", 15); - assertEquals(s.length, 11); + assertEquals(11, s.length); pat = Pattern.compile("b"); s = pat.split("abccbadfebb", 5); - assertEquals(s.length, 5); + assertEquals(5, s.length); s = pat.split("", 1); - assertEquals(s.length, 1); + assertEquals(1, s.length); pat = Pattern.compile(""); s = pat.split("", 1); - assertEquals(s.length, 1); + assertEquals(1, s.length); s = pat.split("abccbadfe", 11); - assertEquals(s.length, 11); + assertEquals(11, s.length); pat = Pattern.compile("b"); s = pat.split("abccbadfebb", 3); - assertEquals(s.length, 3); + assertEquals(3, s.length); pat = Pattern.compile(""); s = pat.split("abccbadfe", 5); - assertEquals(s.length, 5); + assertEquals(5, s.length); } /* @@ -137,18 +137,18 @@ String s[]; Pattern pat = Pattern.compile("b"); s = pat.split("abccbadfebb"); - assertEquals(s.length, 3); + assertEquals(3, s.length); s = pat.split(""); - assertEquals(s.length, 1); + assertEquals(1, s.length); pat = Pattern.compile(""); s = pat.split(""); - assertEquals(s.length, 1); + assertEquals(1, s.length); s = pat.split("abccbadfe"); - assertEquals(s.length, 10); + assertEquals(10, s.length); //bug6544 String s1 = ""; String[] arr = s1.split(":"); - assertEquals(arr.length, 1); + assertEquals(1, arr.length); //bug6544 }