Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-08 14:11:07 +01:00
Code Issues Releases Wiki Activity

Add convenience methods to HashManager

Browse source
This commit is contained in:
vanitasvitae 2017-06-13 23:51:57 +02:00
parent acc98b4b2f
commit 3ecd01135c
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
3 changed files with 186 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java
View file

@ -23,11 +23,11 @@ import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
import static org.jivesoftware.smackx.hashes.HashManager.ALGORITHM.SHA_256;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static junit.framework.TestCase.assertEquals;
/**
* Test toXML and parse of HashElement and HashElementProvider.
@ -37,7 +37,7 @@ public class HashElementTest extends SmackTestSuite {
@Test
public void stanzaTest() throws Exception {
String message = "Hello World!";
HashElement element = HashManager.calculateHashElement(SHA_256, message.getBytes(StringUtils.UTF8));
HashElement element = HashManager.calculateHashElement(SHA_256, HashManager.utf8(message));
String expected = "<hash xmlns='urn:xmpp:hashes:2' algo='sha-256'>f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk=</hash>";
assertEquals(expected, element.toXML().toString());
@ -45,7 +45,7 @@ public class HashElementTest extends SmackTestSuite {
assertEquals(expected, parsed.toXML().toString());
assertEquals(SHA_256, parsed.getAlgorithm());
assertEquals("f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk=", parsed.getHashB64());
assertArrayEquals(HashManager.sha_256(message.getBytes(StringUtils.UTF8)), parsed.getHash());
assertArrayEquals(HashManager.sha_256(message), parsed.getHash());
assertFalse(parsed.equals(expected));
assertFalse(parsed.equals(null));

9
smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java
View file

@ -17,11 +17,8 @@
package org.jivesoftware.smackx.hashes;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.util.StringUtils;
import org.junit.Test;
import java.io.UnsupportedEncodingException;
import static junit.framework.TestCase.assertEquals;
/**
@ -49,11 +46,7 @@ public class HashTest extends SmackTestSuite {
private byte[] array() {
if (testArray == null) {
try {
testArray = testString.getBytes(StringUtils.UTF8);
} catch (UnsupportedEncodingException e) {
throw new AssertionError("UTF8 MUST be supported.");
}
testArray = HashManager.utf8(testString);
}
return testArray;
}