Skip to content

Commit 2d43257

Browse files
author
Vladimir Kocheryzhkin
committed
add simple native test
1 parent d840398 commit 2d43257

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

visionSamples/FaceTracker/app/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020
externalNativeBuild {
2121
cmake {
2222
cppFlags "-frtti -fexceptions"
23-
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a'
23+
abiFilters 'x86', 'x86_64', 'armeabi-v7a'
2424
arguments "-DANDROID_STL=c++_shared"
2525
// Passes optional arguments to CMake.
2626
//arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
@@ -54,18 +54,15 @@ android {
5454
}
5555

5656
dependencies {
57-
implementation 'com.android.support:support-annotations:27.1.1'
58-
5957
androidTestImplementation 'junit:junit:4.12'
58+
implementation 'com.android.support:support-annotations:27.1.1'
6059
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
6160
androidTestImplementation 'com.android.support.test:runner:1.0.2'
6261
androidTestImplementation 'com.android.support.test:rules:1.0.2'
6362
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
64-
6563
implementation fileTree(include: ['*.jar'], dir: 'libs')
6664
implementation 'com.android.support:support-v4:23.4.0'
6765
implementation 'com.android.support:design:23.4.0'
6866
implementation 'com.google.android.gms:play-services-vision:9.4.0+'
6967
implementation 'com.shamanland:xdroid-toaster:0.2.4'
70-
7168
}

visionSamples/FaceTracker/app/src/androidTest/java/com/google/android/gms/samples/vision/face/facetracker/ExampleInstrumentedTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import android.content.Context;
44
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.rule.ActivityTestRule;
56
import android.support.test.runner.AndroidJUnit4;
67

8+
import org.junit.Rule;
79
import org.junit.Test;
810
import org.junit.runner.RunWith;
911

@@ -16,4 +18,15 @@ public void useAppContext() throws Exception {
1618
Context appContext = InstrumentationRegistry.getTargetContext();
1719
assertEquals("com.google.android.gms.samples.vision.face.facetracker", appContext.getPackageName());
1820
}
21+
22+
23+
@Rule
24+
public ActivityTestRule<FaceTrackerActivity> activityRule = new ActivityTestRule(FaceTrackerActivity.class);
25+
26+
@Test
27+
public void callAddContext() {
28+
FaceTrackerActivity activity = activityRule.getActivity();
29+
int res = activity.nativeAdd(1,2);
30+
assertEquals(3, res);
31+
}
1932
}

visionSamples/FaceTracker/app/src/main/cpp/native-lib.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,4 +287,11 @@ Java_com_google_android_gms_samples_vision_face_facetracker_FaceTrackerActivity_
287287

288288
AndroidBitmap_unlockPixels(env, bmp);
289289
return env->NewStringUTF(returnValue.c_str());
290+
}extern "C"
291+
JNIEXPORT jint JNICALL
292+
Java_com_google_android_gms_samples_vision_face_facetracker_FaceTrackerActivity_nativeAdd(
293+
JNIEnv *env, jobject instance, jint a, jint b) {
294+
295+
return a + b;
296+
290297
}

visionSamples/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/FaceTrackerActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,4 +444,5 @@ public void onDone() {
444444

445445
public native int loadResources();
446446
public native String recognizeFromImage(Bitmap bmp);
447+
public native int nativeAdd(int a, int b);
447448
}

0 commit comments

Comments
 (0)