diff options
| -rw-r--r-- | icing/jni/icing-search-engine-jni.cc | 14 | ||||
| -rw-r--r-- | java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java | 75 |
2 files changed, 89 insertions, 0 deletions
diff --git a/icing/jni/icing-search-engine-jni.cc b/icing/jni/icing-search-engine-jni.cc index f551054..a0883fa 100644 --- a/icing/jni/icing-search-engine-jni.cc +++ b/icing/jni/icing-search-engine-jni.cc @@ -499,6 +499,9 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { {"nativeGetSchema", "(Lcom/google/android/icing/IcingSearchEngineImpl;)[B", reinterpret_cast<void*>(nativeGetSchema)}, + {"nativeGetSchemaType", + "(Lcom/google/android/icing/IcingSearchEngineImpl;Ljava/lang/String;)[B", + reinterpret_cast<void*>(nativeGetSchemaType)}, {"nativePut", "(Lcom/google/android/icing/IcingSearchEngineImpl;[B)[B", reinterpret_cast<void*>(nativePut)}, {"nativeGet", @@ -524,6 +527,12 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { "(Lcom/google/android/icing/IcingSearchEngineImpl;Ljava/lang/" "String;Ljava/lang/String;)[B", reinterpret_cast<void*>(nativeDelete)}, + {"nativeDeleteByNamespace", + "(Lcom/google/android/icing/IcingSearchEngineImpl;Ljava/lang/String;)[B", + reinterpret_cast<void*>(nativeDeleteByNamespace)}, + {"nativeDeleteBySchemaType", + "(Lcom/google/android/icing/IcingSearchEngineImpl;Ljava/lang/String;)[B", + reinterpret_cast<void*>(nativeDeleteBySchemaType)}, {"nativeDeleteByQuery", "(Lcom/google/android/icing/IcingSearchEngineImpl;[BZ)[B", reinterpret_cast<void*>(nativeDeleteByQuery)}, @@ -546,6 +555,11 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { {"nativeGetDebugInfo", "(Lcom/google/android/icing/IcingSearchEngineImpl;I)[B", reinterpret_cast<void*>(nativeGetDebugInfo)}, + {"nativeShouldLog", "(SS)Z", reinterpret_cast<void*>(nativeShouldLog)}, + {"nativeSetLoggingLevel", "(SS)Z", + reinterpret_cast<void*>(nativeSetLoggingLevel)}, + {"nativeGetLoggingTag", "()Ljava/lang/String;", + reinterpret_cast<void*>(nativeGetLoggingTag)}, }; int register_natives_success = env->RegisterNatives( java_class, methods, sizeof(methods) / sizeof(JNINativeMethod)); diff --git a/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java b/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java index d243f87..2bbd621 100644 --- a/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java +++ b/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java @@ -296,6 +296,56 @@ public final class IcingSearchEngineTest { } @Test + public void testDeleteByNamespace() throws Exception { + assertStatusOk(icingSearchEngine.initialize().getStatus()); + + SchemaTypeConfigProto emailTypeConfig = createEmailTypeConfig(); + SchemaProto schema = SchemaProto.newBuilder().addTypes(emailTypeConfig).build(); + assertThat( + icingSearchEngine + .setSchema(schema, /*ignoreErrorsAndDeleteDocuments=*/ false) + .getStatus() + .getCode()) + .isEqualTo(StatusProto.Code.OK); + + DocumentProto emailDocument = createEmailDocument("namespace", "uri"); + assertStatusOk(icingSearchEngine.put(emailDocument).getStatus()); + + DeleteByNamespaceResultProto deleteByNamespaceResultProto = + icingSearchEngine.deleteByNamespace("namespace"); + assertStatusOk(deleteByNamespaceResultProto.getStatus()); + + GetResultProto getResultProto = + icingSearchEngine.get("namespace", "uri", GetResultSpecProto.getDefaultInstance()); + assertThat(getResultProto.getStatus().getCode()).isEqualTo(StatusProto.Code.NOT_FOUND); + } + + @Test + public void testDeleteBySchemaType() throws Exception { + assertStatusOk(icingSearchEngine.initialize().getStatus()); + + SchemaTypeConfigProto emailTypeConfig = createEmailTypeConfig(); + SchemaProto schema = SchemaProto.newBuilder().addTypes(emailTypeConfig).build(); + assertThat( + icingSearchEngine + .setSchema(schema, /*ignoreErrorsAndDeleteDocuments=*/ false) + .getStatus() + .getCode()) + .isEqualTo(StatusProto.Code.OK); + + DocumentProto emailDocument = createEmailDocument("namespace", "uri"); + assertStatusOk(icingSearchEngine.put(emailDocument).getStatus()); + + DeleteBySchemaTypeResultProto deleteBySchemaTypeResultProto = + icingSearchEngine.deleteBySchemaType(EMAIL_TYPE); + assertStatusOk(deleteBySchemaTypeResultProto.getStatus()); + + GetResultProto getResultProto = + icingSearchEngine.get("namespace", "uri", GetResultSpecProto.getDefaultInstance()); + assertThat(getResultProto.getStatus().getCode()).isEqualTo(StatusProto.Code.NOT_FOUND); + } + + @Test public void testDeleteByQuery() throws Exception { assertStatusOk(icingSearchEngine.initialize().getStatus()); @@ -700,6 +750,31 @@ public final class IcingSearchEngineTest { assertThat(response.getSuggestions(1).getQuery()).isEqualTo("fo"); } + @Test + public void testLogging() throws Exception { + // Set to INFO + assertThat(IcingSearchEngine.setLoggingLevel(LogSeverity.Code.INFO)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.INFO)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.DBG)).isFalse(); + + // Set to WARNING + assertThat(IcingSearchEngine.setLoggingLevel(LogSeverity.Code.WARNING)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.WARNING)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.INFO)).isFalse(); + + // Set to DEBUG + assertThat(IcingSearchEngine.setLoggingLevel(LogSeverity.Code.DBG)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.DBG)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.VERBOSE)).isFalse(); + + // Set to VERBOSE + assertThat(IcingSearchEngine.setLoggingLevel(LogSeverity.Code.VERBOSE, (short) 1)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.VERBOSE, (short) 1)).isTrue(); + assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.VERBOSE, (short) 2)).isFalse(); + + assertThat(IcingSearchEngine.getLoggingTag()).isNotEmpty(); + } + private static void assertStatusOk(StatusProto status) { assertWithMessage(status.getMessage()).that(status.getCode()).isEqualTo(StatusProto.Code.OK); } |