Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d055cca7 authored by Jean Chalard's avatar Jean Chalard
Browse files

Add an initial test command to dicttool. 

Also fix some warnings
This is a preliminary change to help track b/8526576

Bug: 8526576
Change-Id: If2ed74bb92f9b5fb7bbaf9c4851d9d0b5514b405
parent 286877b3

tools/dicttool/Android.mk

+3 −5
Original line number Diff line number Diff line
@@ -28,12 +28,10 @@ LOCAL_ANNOTATIONS_SRC_FILES := \ 
LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \

        $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \

        $(LOCAL_ANNOTATIONS_SRC_FILES) \

        $(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java

        $(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java \

        $(call all-java-files-under, tests)



ifeq ($(DICTTOOL_UNITTEST), true)

    LOCAL_SRC_FILES += $(call all-java-files-under, tests)

LOCAL_JAVA_LIBRARIES := junit

endif



LOCAL_JAR_MANIFEST := etc/manifest.txt

LOCAL_MODULE := dicttool_aosp

tools/dicttool/etc/dicttool_aosp

+11 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ progdir=`pwd` 
prog="${progdir}"/`basename "${prog}"`

cd "${oldwd}"



classname=com.android.inputmethod.latin.dicttool.Dicttool

jarfile=dicttool_aosp.jar

frameworkdir="$progdir"

if [ ! -r "$frameworkdir/$jarfile" ]
@@ -51,12 +52,21 @@ then 
    exit 1

fi



lib=junit.jar

if [ ! -r "$frameworkdir/$lib" ]

then

    echo `basename "$prog"`": can't find lib $lib"

    exit 1

fi



if [ "$OSTYPE" = "cygwin" ] ; then

    jarpath=`cygpath -w  "$frameworkdir/$jarfile"`

    libpath=`cygpath -w  "$frameworkdir/$lib"`

    progdir=`cygpath -w  "$progdir"`

else

    jarpath="$frameworkdir/$jarfile"

    libpath="$frameworkdir/$lib"

fi



# might need more memory, e.g. -Xmx128M

exec java -ea -jar "$jarpath" "$@"
 
exec java -ea -classpath "$libpath":"$jarpath" "$classname" "$@"

tools/dicttool/src/com/android/inputmethod/latin/dicttool/CommandList.java

+1 −0
Original line number Diff line number Diff line
@@ -27,5 +27,6 @@ public class CommandList { 
        Dicttool.addCommand("package", Package.Packager.class);

        Dicttool.addCommand("unpackage", Package.Unpackager.class);

        Dicttool.addCommand("makedict", Makedict.class);

        Dicttool.addCommand("test", Test.class);

    }

}

tools/dicttool/src/com/android/inputmethod/latin/dicttool/Crypt.java

+4 −0
Original line number Diff line number Diff line
@@ -40,10 +40,12 @@ public class Crypt { 
        public Encrypter() {

        }



        @Override

        public String getHelp() {

            return COMMAND + " <src_filename> <dst_filename>: Encrypts a file";

        }



        @Override

        public void run() {

            throw new UnsupportedOperationException();

        }
@@ -55,10 +57,12 @@ public class Crypt { 
        public Decrypter() {

        }



        @Override

        public String getHelp() {

            return COMMAND + " <src_filename> <dst_filename>: Decrypts a file";

        }



        @Override

        public void run() {

            throw new UnsupportedOperationException();

        }

tools/dicttool/src/com/android/inputmethod/latin/dicttool/Package.java

+4 −2
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ import java.io.File; 
import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.FileOutputStream;

import java.io.InputStream;

import java.io.IOException;

import java.io.OutputStream;



public class Package {

    private Package() {
@@ -39,10 +37,12 @@ public class Package { 
        public Packager() {

        }



        @Override

        public String getHelp() {

            return COMMAND + " <src_filename> <dst_filename>: Package a file for distribution";

        }



        @Override

        public void run() throws IOException {

            if (mArgs.length != 2) {

                throw new RuntimeException("Too many/too few arguments for command " + COMMAND);
@@ -67,11 +67,13 @@ public class Package { 
        public Unpackager() {

        }



        @Override

        public String getHelp() {

            return COMMAND + " <src_filename> <dst_filename>: Detects how a file is packaged and\n"

                    + "decrypts/uncompresses as necessary to produce a raw binary file.";

        }



        @Override

        public void run() throws FileNotFoundException, IOException {

            if (mArgs.length != 2) {

                throw new RuntimeException("Too many/too few arguments for command " + COMMAND);