Java API: added support for read/write functions in features2d
This commit is contained in:
@@ -5,10 +5,7 @@ import android.test.AndroidTestRunner;
|
||||
import android.test.InstrumentationTestRunner;
|
||||
import android.util.Log;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import org.opencv.Android;
|
||||
|
||||
/**
|
||||
* This only class is Android specific. The original idea about test order
|
||||
@@ -22,6 +19,7 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
|
||||
public static String LENA_PATH;
|
||||
public static String CHESS_PATH;
|
||||
public static String LBPCASCADE_FRONTALFACE_PATH;
|
||||
public static Context context;
|
||||
|
||||
private AndroidTestRunner androidTestRunner;
|
||||
private static String TAG = "opencv_test_java";
|
||||
@@ -32,9 +30,10 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
LENA_PATH = ExportResource(R.drawable.lena);
|
||||
CHESS_PATH = ExportResource(R.drawable.chessboard);
|
||||
LBPCASCADE_FRONTALFACE_PATH = ExportResource(R.raw.lbpcascade_frontalface);
|
||||
context = getContext();
|
||||
LENA_PATH = Android.ExportResource(context, R.drawable.lena);
|
||||
CHESS_PATH = Android.ExportResource(context, R.drawable.chessboard);
|
||||
LBPCASCADE_FRONTALFACE_PATH = Android.ExportResource(context, R.raw.lbpcascade_frontalface);
|
||||
|
||||
// List<TestCase> testCases = androidTestRunner.getTestCases();
|
||||
// Collections.shuffle(testCases); //shuffle the tests order
|
||||
@@ -47,32 +46,4 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
|
||||
androidTestRunner = super.getAndroidTestRunner();
|
||||
return androidTestRunner;
|
||||
}
|
||||
|
||||
private String ExportResource(int resourceId) {
|
||||
String fullname = getContext().getResources().getString(resourceId);
|
||||
String resName = fullname.substring(fullname.lastIndexOf("/") + 1);
|
||||
try {
|
||||
InputStream is = getContext().getResources().openRawResource(
|
||||
resourceId);
|
||||
File resDir = getContext().getDir("testdata", Context.MODE_PRIVATE);
|
||||
File resFile = new File(resDir, resName);
|
||||
|
||||
FileOutputStream os = new FileOutputStream(resFile);
|
||||
|
||||
byte[] buffer = new byte[4096];
|
||||
int bytesRead;
|
||||
while ((bytesRead = is.read(buffer)) != -1) {
|
||||
os.write(buffer, 0, bytesRead);
|
||||
}
|
||||
is.close();
|
||||
os.close();
|
||||
|
||||
return resFile.getAbsolutePath();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
Log("Failed to export resource " + resName + ". Exception thrown: "
|
||||
+ e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,5 @@ package org.opencv.test.features2d;
|
||||
|
||||
import org.opencv.test.OpenCVTestCase;
|
||||
|
||||
|
||||
public class features2dTest extends OpenCVTestCase {
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user