1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-02 09:46:24 +02:00

Add Unittest for Rtl + some small fixes

This commit is contained in:
Roi Greenberg 2018-09-05 01:39:01 +03:00
parent f233ad79fa
commit 761d8327f9
2 changed files with 385 additions and 24 deletions

View File

@ -2,7 +2,6 @@ package nodomain.freeyourgadget.gadgetbridge.util;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
import java.util.ArrayList;
import java.util.HashMap;
@ -22,7 +21,7 @@ public class RtlUtils {
return GBApplication.getPrefs().getBoolean("rtl", false);
}
enum characterType{
public enum characterType{
ltr,
rtl,
rtl_arabic,
@ -81,7 +80,7 @@ public class RtlUtils {
/**
* @return true if the char is in the rtl range, otherwise false
*/
static boolean isHebrew(Character c){
public static boolean isHebrew(Character c){
return getCharacterType(c) == characterType.rtl;
}
@ -89,7 +88,7 @@ public class RtlUtils {
/**
* @return true if the char is in the rtl range, otherwise false
*/
static boolean isArabic(Character c){
public static boolean isArabic(Character c){
return getCharacterType(c) == characterType.rtl_arabic;
}
@ -97,7 +96,7 @@ public class RtlUtils {
/**
* @return true if the char is in the rtl range, otherwise false
*/
static boolean isLtr(Character c){
public static boolean isLtr(Character c){
return getCharacterType(c) == characterType.ltr;
}
@ -105,7 +104,7 @@ public class RtlUtils {
/**
* @return true if the char is in the rtl range, otherwise false
*/
static boolean isRtl(Character c){
public static boolean isRtl(Character c){
return (getCharacterType(c) == characterType.rtl) || (getCharacterType(c) == characterType.rtl_arabic);
}
@ -113,7 +112,7 @@ public class RtlUtils {
/**
* @return true if the char is in the punctuations range, otherwise false
*/
static boolean isPunctuations(Character c){
public static boolean isPunctuations(Character c){
return getCharacterType(c) == characterType.punctuation;
}
@ -122,7 +121,7 @@ public class RtlUtils {
/**
* @return true if the char is in the end of word list, otherwise false
*/
static boolean isSpaceSign(Character c){
public static boolean isSpaceSign(Character c){
return getCharacterType(c) == characterType.space;
}
@ -130,7 +129,7 @@ public class RtlUtils {
/**
* @return true if the char is in the end of word list, otherwise false
*/
static boolean isEndLineSign(Character c){
public static boolean isEndLineSign(Character c){
return getCharacterType(c) == characterType.lineEnd;
}
@ -284,14 +283,14 @@ public class RtlUtils {
put((char)('ل' + 'ا'), '\uFEFC');
}
};
enum contextualState{
public enum contextualState{
isolate,
begin,
middle,
end
}
private static boolean exceptionAfterLam(Character c){
public static boolean exceptionAfterLam(Character c){
switch (c){
case '\u0622':
case '\u0623':
@ -310,7 +309,7 @@ public class RtlUtils {
* @param state - the character state: beginning, middle, end or isolated
* @return the contextual character
*/
private static Character getContextualSymbol(Character c, contextualState state) {
public static Character getContextualSymbol(Character c, contextualState state) {
Character newChar;
switch (state){
case begin:
@ -341,7 +340,7 @@ public class RtlUtils {
* @param nextChar - the next character or null if none
* @return the current character contextual state
*/
private static contextualState getCharContextualState(contextualState prevState, Character curChar, Character nextChar) {
public static contextualState getCharContextualState(contextualState prevState, Character curChar, Character nextChar) {
contextualState curState;
if ((prevState == contextualState.isolate || prevState == contextualState.end) &&
contextualArabicBeginning.containsKey(curChar) &&
@ -368,7 +367,7 @@ public class RtlUtils {
* @param s - the given string
* @return the contextual form of the string
*/
static String converToContextual(String s){
public static String convertToContextual(String s){
if (s == null || s.isEmpty() || s.length() == 1){
return s;
}
@ -417,7 +416,7 @@ public class RtlUtils {
* @param s - the string to reverse
* @return reversed string
*/
static String reverse(String s) {
public static String reverse(String s) {
int j = s.length();
int isEndLine = 0;
char[] newWord = new char[j];
@ -426,12 +425,6 @@ public class RtlUtils {
return s;
}
// remain end-of-word sign at the end
// if (isEndLineSign(s.charAt(s.length() - 1))){
// isEndLine = 1;
// newWord[--j] = s.charAt(s.length() - 1);
// }
for (int i = 0; i < s.length() - isEndLine; i++) {
if (directionSignsMap.containsKey(s.charAt(i))) {
newWord[--j] = directionSignsMap.get(s.charAt(i));
@ -443,7 +436,7 @@ public class RtlUtils {
return new String(newWord);
}
static String fixWhitespace(String s){
public static String fixWhitespace(String s){
int length = s.length();
if (length > 0 && isSpaceSign(s.charAt(length - 1))){
@ -471,7 +464,7 @@ public class RtlUtils {
String newString = "";
List<String> lines = new ArrayList<>();
char[] newWord = new char[length];
int line_max_size = GBApplication.getPrefs().getInt("rtl_max_line_length", 20);;
int line_max_size = GBApplication.getPrefs().getInt("rtl_max_line_length", 18);
int startPos = 0;
int endPos = 0;
@ -528,7 +521,7 @@ public class RtlUtils {
Log.d("ROIGR", "phrase: |" + phraseString + "|");
if (PhraseRtlType == characterType.rtl) {
if (contextualSupport()) {
phraseString = converToContextual(phraseString);
phraseString = convertToContextual(phraseString);
}
phraseString = reverse(phraseString);
}

View File

@ -0,0 +1,368 @@
package nodomain.freeyourgadget.gadgetbridge.test;
import android.content.SharedPreferences;
import org.junit.Test;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.util.RtlUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Tests RtlUtils
*/
public class RtlUtilsTest extends TestBase {
// @Test
private Character hebrew1 = 'א';
private Character hebrew2 = 'ם';
private Character arabic1 = 'ا';
private Character arabic2 = 'ن';
private Character english1 = 'a';
private Character english2 = 'N';
private Character punctuation1 = '.';
private Character punctuation2 = '-';
private Character space = ' ';
private Character endLine1 = '\0';
private Character endLine2 = '\n';
private Character[] contextualIsolated = {'ء', '\uFE80'};
private Character[] contextualBeginning = {'س', '\uFEB3'};
private Character[] contextualMiddle = {'ض', '\uFEC0'};
private Character[] contextualEndNoMiddle = {'آ', '\uFE82'};
private Character[] contextualLam = {(char)('ل' + 'أ'), '\uFEF8'};
private String hebrewWord1 = "שלום";
private String hebrewWord2 = "וברכה";
private String hebrewPhrase = hebrewWord1 + " " + hebrewWord2;
private String arabicWord1 = "سلام";
private String arabicWord2 = "البركة";
private String arabicPhrase = arabicWord1 + " " + arabicWord2;
private String englishWord1 = "Hello";
private String englishWord2 = "Welcome";
private String englishPhrase = englishWord1 + " and " + englishWord2;
@Test
public void testGetCharacterType() throws Exception {
RtlUtils.characterType actual = RtlUtils.getCharacterType(hebrew1);
RtlUtils.characterType expected = RtlUtils.characterType.rtl;
assertEquals("Get Hebrew Character type failed", expected, actual);
actual = RtlUtils.getCharacterType(arabic1);
expected = RtlUtils.characterType.rtl_arabic;
assertEquals("Get Arabic Character type failed", expected, actual);
actual = RtlUtils.getCharacterType(english1);
expected = RtlUtils.characterType.ltr;
assertEquals("Get Hebrew Character type failed", expected, actual);
actual = RtlUtils.getCharacterType(' ');
expected = RtlUtils.characterType.space;
assertEquals("Get Hebrew Character type failed", expected, actual);
}
@Test
public void testIsHebrew() throws Exception {
boolean result = RtlUtils.isHebrew(hebrew1);
assertTrue("Is Hebrew Character failed", result);
result = RtlUtils.isHebrew(hebrew2);
assertTrue("Is Hebrew Character failed", result);
result = RtlUtils.isHebrew(arabic1);
assertFalse("Is Hebrew Character failed", result);
result = RtlUtils.isHebrew(english1);
assertFalse("Is Hebrew Character failed", result);
}
@Test
public void testIsArabic() throws Exception {
boolean result = RtlUtils.isArabic(arabic1);
assertTrue("Is Arabic Character failed", result);
result = RtlUtils.isArabic(arabic2);
assertTrue("Is Arabic Character failed", result);
result = RtlUtils.isArabic(hebrew1);
assertFalse("Is Arabic Character failed", result);
result = RtlUtils.isArabic(english1);
assertFalse("Is Arabic Character failed", result);
}
@Test
public void testIsLtr() throws Exception {
boolean result = RtlUtils.isLtr(english1);
assertTrue("Is Ltr Character failed", result);
result = RtlUtils.isLtr(english1);
assertTrue("Is Ltr Character failed", result);
result = RtlUtils.isLtr(hebrew1);
assertFalse("Is Ltr Character failed", result);
result = RtlUtils.isLtr(arabic1);
assertFalse("Is Ltr Character failed", result);
}
@Test
public void testIsRtl() throws Exception {
boolean result = RtlUtils.isRtl(hebrew1);
assertTrue("Is Rtl Character failed", result);
result = RtlUtils.isRtl(arabic1);
assertTrue("Is Rtl Character failed", result);
result = RtlUtils.isRtl(english1);
assertFalse("Is Rtl Character failed", result);
result = RtlUtils.isRtl(punctuation1);
assertFalse("Is Rtl Character failed", result);
}
@Test
public void testIsPunctuation() throws Exception {
boolean result = RtlUtils.isPunctuations(punctuation1);
assertTrue("Is Punctuation Character failed", result);
result = RtlUtils.isPunctuations(punctuation1);
assertTrue("Is Punctuation Character failed", result);
result = RtlUtils.isPunctuations(english1);
assertFalse("Is Punctuation Character failed", result);
result = RtlUtils.isPunctuations(space);
assertFalse("Is Punctuation Character failed", result);
}
@Test
public void testIsSpaceSign() throws Exception {
boolean result = RtlUtils.isSpaceSign(space);
assertTrue("Is Space Sign Character failed", result);
result = RtlUtils.isSpaceSign(punctuation1);
assertFalse("Is Space Sign Character failed", result);
result = RtlUtils.isSpaceSign(english1);
assertFalse("Is SpaceSign Character failed", result);
result = RtlUtils.isSpaceSign(hebrew1);
assertFalse("Is SpaceSign Character failed", result);
}
@Test
public void testIsEndLineSign() throws Exception {
boolean result = RtlUtils.isEndLineSign(endLine1);
assertTrue("Is End Line Sign Character failed", result);
result = RtlUtils.isEndLineSign(endLine2);
assertTrue("Is End Line Sign Character failed", result);
result = RtlUtils.isEndLineSign(english1);
assertFalse("Is End Line Sign Character failed", result);
result = RtlUtils.isEndLineSign(space);
assertFalse("Is End Line Sign Character failed", result);
}
@Test
public void testExceptionAfterLam() throws Exception {
boolean result = RtlUtils.exceptionAfterLam('\u0623');
assertTrue("Is Exception After Lam failed", result);
result = RtlUtils.exceptionAfterLam('\u0630');
assertFalse("Is Exception After Lam failed", result);
result = RtlUtils.exceptionAfterLam('\u062A');
assertFalse("Is Exception After Lam failed", result);
}
@Test
public void testGetContextualSymbol() throws Exception {
Character actual = RtlUtils.getContextualSymbol(contextualIsolated[0], RtlUtils.contextualState.isolate);
Character expected = contextualIsolated[1];
assertEquals("Get Contextual Symbol failed", expected, actual);
actual = RtlUtils.getContextualSymbol(contextualBeginning[0], RtlUtils.contextualState.begin);
expected = contextualBeginning[1];
assertEquals("Get Contextual Symbol failed", expected, actual);
actual = RtlUtils.getContextualSymbol(contextualMiddle[0], RtlUtils.contextualState.middle);
expected = contextualMiddle[1];
assertEquals("Get Contextual Symbol failed", expected, actual);
actual = RtlUtils.getContextualSymbol(contextualEndNoMiddle[0], RtlUtils.contextualState.end);
expected = contextualEndNoMiddle[1];
assertEquals("Get Contextual Symbol failed", expected, actual);
actual = RtlUtils.getContextualSymbol(contextualEndNoMiddle[0], RtlUtils.contextualState.middle);
expected = contextualEndNoMiddle[0];
assertEquals("Get Contextual Symbol failed", expected, actual);
}
@Test
public void testGetCharContextualState() throws Exception {
RtlUtils.contextualState actual = RtlUtils.getCharContextualState(RtlUtils.contextualState.isolate, contextualBeginning[0], contextualEndNoMiddle[0]);
RtlUtils.contextualState expected = RtlUtils.contextualState.begin;
assertEquals("Get Char Contextual State failed", expected, actual);
actual = RtlUtils.getCharContextualState(RtlUtils.contextualState.begin, contextualMiddle[0], contextualEndNoMiddle[0]);
expected = RtlUtils.contextualState.middle;
assertEquals("Get Char Contextual State failed", expected, actual);
actual = RtlUtils.getCharContextualState(RtlUtils.contextualState.begin, contextualMiddle[0], contextualIsolated[0]);
expected = RtlUtils.contextualState.end;
assertEquals("Get Char Contextual State failed", expected, actual);
actual = RtlUtils.getCharContextualState(RtlUtils.contextualState.begin, contextualIsolated[0], contextualEndNoMiddle[0]);
expected = RtlUtils.contextualState.isolate;
assertEquals("Get Char Contextual State failed", expected, actual);
}
@Test
public void testConvertToContextual() throws Exception {
String actual = RtlUtils.convertToContextual("");
String expected = "";
assertEquals("Convert To Contextual failed", expected, actual);
char[] nonContextual = {'ج', 'ج', 'ج'};
char[] contextual = {'\uFE9F', '\uFEA0', '\uFE9E'};
actual = RtlUtils.convertToContextual(new StringBuilder().append(nonContextual).toString());
expected = new StringBuilder().append(contextual).toString();
assertEquals("Convert To Contextual failed", expected, actual);
char[] nonContextual2 = {'ج', 'ج', 'ل', '\u0622','ج'};
char[] contextual2 = {'\uFE9F', '\uFEA0', '\uFEF6', '\uFE9D'};
actual = RtlUtils.convertToContextual(new StringBuilder().append(nonContextual2).toString());
expected = new StringBuilder().append(contextual2).toString();
assertEquals("Convert To Contextual failed", expected, actual);
}
@Test
public void testReverse() throws Exception {
String actual = RtlUtils.reverse(hebrewWord1);
String expected = "םולש";
assertEquals("Reverse failed", expected, actual);
actual = RtlUtils.reverse(hebrewPhrase);
expected = "הכרבו םולש";
assertEquals("Reverse failed", expected, actual);
actual = RtlUtils.reverse("טקסט עם (סוגריים) וסימן שאלה?");
expected = "?הלאש ןמיסו (םיירגוס) םע טסקט";
assertEquals("Reverse failed", expected, actual);
}
@Test
public void testFixWhitespace() throws Exception {
String actual = RtlUtils.fixWhitespace(englishPhrase + " ");
String expected = " " + englishPhrase;
assertEquals("fix whitespace failed", expected, actual);
actual = RtlUtils.fixWhitespace(englishPhrase);
expected = englishPhrase;
assertEquals("fix whitespace failed", expected, actual);
}
@Test
public void testFixRtl() throws Exception {
String actual = RtlUtils.fixRtl("Only english");
String expected = "Only english";
assertEquals("fix rtl failed", expected, actual);
actual = RtlUtils.fixRtl("Only very long english with more than 18 characters");
expected = " Only very long\n" +
" english with more\n" +
" than 18\n" +
"characters";
assertEquals("fix rtl failed", expected, actual);
actual = RtlUtils.fixRtl("רק עברית");
expected = "תירבע קר";
assertEquals("fix rtl failed", expected, actual);
actual = RtlUtils.fixRtl("English and עברית");
expected = "תירבע English and";
assertEquals("fix rtl failed", expected, actual);
actual = RtlUtils.fixRtl("משפט ארוך עם עברית and English וגם קצת סימנים כמו ?!$ (וגם ^.)");
expected = " םע ךורא טפשמ\n" +
" and English תירבע\n" +
" םינמיס תצק םגו\n" +
"(.^ םגו) $!? ומכ";
assertEquals("fix rtl failed", expected, actual);
actual = RtlUtils.fixRtl("משפט עם כותרת\0ושמכיל גם ירידת\ורה");
expected = "תרתוכ םע טפשמ\0תדירי םג ליכמשו\n" +
"הרוש";
assertEquals("fix rtl failed", expected, actual);
}
@Test
public void testRtlSupport() throws Exception {
setDefaultRtl();
assertFalse("Rtl option fail! Expected 'Off' by default, but result is 'On'", RtlUtils.rtlSupport());
enableRtl(true);
assertTrue("Rtl option fail! Expected 'On', but result is 'Off'", RtlUtils.rtlSupport());
}
private void setDefaultRtl() {
SharedPreferences settings = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = settings.edit();
editor.remove("rtl");
editor.apply();
}
private void enableRtl(boolean enable) {
SharedPreferences settings = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = settings.edit();
editor.putBoolean("rtl", enable);
editor.apply();
}
@Test
public void testContextualSupport() throws Exception {
setDefaultContextual();
assertFalse("Contextual option fail! Expected 'Off' by default, but result is 'On'", RtlUtils.contextualSupport());
enableContextual(true);
assertTrue("Contextual option fail! Expected 'On', but result is 'Off'", RtlUtils.contextualSupport());
}
private void setDefaultContextual() {
SharedPreferences settings = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = settings.edit();
editor.remove("contextualArabic");
editor.apply();
}
private void enableContextual(boolean enable) {
SharedPreferences settings = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = settings.edit();
editor.putBoolean("contextualArabic", enable);
editor.apply();
}
}