Skip to content

Commit 5530658

Browse files
committed
fix test
1 parent d37b412 commit 5530658

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed
Binary file not shown.
Binary file not shown.

visionSamples/FaceTracker/app/src/androidTest/java/dlib/android/FaceRecognizerTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
import android.graphics.Bitmap;
55
import android.graphics.BitmapFactory;
66
import android.support.test.InstrumentationRegistry;
7+
import android.util.Log;
78

89
import org.junit.Test;
910

1011
import java.io.IOException;
1112
import java.io.InputStream;
1213

14+
import static org.junit.Assert.assertEquals;
15+
1316
public class FaceRecognizerTest {
1417
private static final String TAG = "FaceRecognizerTest";
1518

@@ -18,10 +21,10 @@ public void RecognizeTest() throws IOException {
1821
FaceRecognizer fr = new FaceRecognizer();
1922
fr.loadNative();
2023
Context testContext = InstrumentationRegistry.getInstrumentation().getContext();
21-
InputStream testInput = testContext.getAssets().open("1.png");
24+
InputStream testInput = testContext.getAssets().open("2.bmp");
2225
Bitmap bitmap = BitmapFactory.decodeStream(testInput);
23-
// Log.i(TAG, String.format("test1: %d", bitmap.getAllocationByteCount()));
24-
// String res = fr.recognizeNative1(bitmap);
25-
// assertEquals("Unknown", res);
26+
Log.i(TAG, String.format("test1: %d", bitmap.getAllocationByteCount()));
27+
String res = fr.recognizeNative1(bitmap);
28+
assertEquals("Unknown", res);
2629
}
2730
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,12 @@ Java_dlib_android_FaceRecognizer_recognizeNative1(JNIEnv *env,
241241
}
242242

243243
std::string returnValue = "Num Faces: ";
244+
244245
std::vector<dlib::rectangle> dets = detector1(img);
246+
if (dets.size() == 0){
247+
std::string name = "Unknown";
248+
return env->NewStringUTF(name.c_str());
249+
}
245250
returnValue += std::to_string(dets.size());
246251
returnValue += ". ";
247252

0 commit comments

Comments
 (0)