Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ec6fb0be
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ec6fb0be
编写于
7月 05, 2011
作者:
K
Kirill Kornyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
java tests: now only OpenCVTestRunner contains android specific stuff
上级
3fc87907
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
74 addition
and
52 deletion
+74
-52
modules/java/android_test/AndroidManifest.xml
modules/java/android_test/AndroidManifest.xml
+2
-1
modules/java/android_test/src/org/opencv/test/MatTest.java
modules/java/android_test/src/org/opencv/test/MatTest.java
+1
-1
modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
...java/android_test/src/org/opencv/test/OpenCVTestCase.java
+7
-11
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
...va/android_test/src/org/opencv/test/OpenCVTestRunner.java
+59
-0
modules/java/android_test/src/org/opencv/test/coreTest.java
modules/java/android_test/src/org/opencv/test/coreTest.java
+3
-2
modules/java/android_test/src/org/opencv/test/highguiTest.java
...es/java/android_test/src/org/opencv/test/highguiTest.java
+2
-2
modules/java/android_test/src/org/opencv/test/utils.java
modules/java/android_test/src/org/opencv/test/utils.java
+0
-35
未找到文件。
modules/java/android_test/AndroidManifest.xml
浏览文件 @
ec6fb0be
...
...
@@ -5,7 +5,8 @@
android:versionName=
"1.0"
>
<uses-sdk
android:minSdkVersion=
"8"
/>
<instrumentation
android:targetPackage=
"org.opencv.test"
android:name=
"android.test.InstrumentationTestRunner"
/>
<instrumentation
android:targetPackage=
"org.opencv.test"
android:name=
"OpenCVTestRunner"
></instrumentation>
<application
android:icon=
"@drawable/icon"
android:label=
"@string/app_name"
>
<uses-library
android:name=
"android.test.runner"
/>
</application>
...
...
modules/java/android_test/src/org/opencv/test/MatTest.java
浏览文件 @
ec6fb0be
...
...
@@ -10,7 +10,7 @@ public class MatTest extends OpenCVTestCase {
public
void
testChannels
()
{
//fail("Not yet implemented");
utils
.
Log
(
grayRnd
.
dump
());
//
utils.Log(grayRnd.dump());
}
public
void
testClone
()
{
...
...
modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
浏览文件 @
ec6fb0be
...
...
@@ -8,9 +8,7 @@ import org.opencv.highgui;
public
class
OpenCVTestCase
extends
TestCase
{
static
String
LENA
=
"/data/data/org.opencv.test/files/lena.jpg"
;
static
int
matSize
=
10
;
static
Mat
dst
;
...
...
@@ -72,11 +70,11 @@ public class OpenCVTestCase extends TestCase {
gray0_64f
=
new
Mat
(
matSize
,
matSize
,
Mat
.
CvType
.
CV_64FC1
);
gray0_64f
.
setTo
(
0.0
);
gray0_64f_1d
=
new
Mat
(
1
,
matSize
,
Mat
.
CvType
.
CV_64FC1
);
gray0_64f_1d
.
setTo
(
0.0
);
rgbLena
=
highgui
.
imread
(
LENA
);
rgba0
=
new
Mat
(
matSize
,
matSize
,
Mat
.
CvType
.
CV_8UC4
);
rgba0
.
setTo
(
0
,
0
,
0
,
0
);
rgba128
=
new
Mat
(
matSize
,
matSize
,
Mat
.
CvType
.
CV_8UC4
);
rgba128
.
setTo
(
128
,
128
,
128
,
128
);
rgbLena
=
highgui
.
imread
(
OpenCVTestRunner
.
LENA_PATH
);
}
public
static
void
assertMatEqual
(
Mat
m1
,
Mat
m2
)
{
...
...
@@ -93,10 +91,8 @@ public class OpenCVTestCase extends TestCase {
}
public
void
test_1
(
String
label
)
{
utils
.
Log
(
"================================================"
);
utils
.
Log
(
"=============== "
+
label
);
utils
.
Log
(
"================================================"
);
new
utils
().
ExportLena
();
OpenCVTestRunner
.
Log
(
"================================================"
);
OpenCVTestRunner
.
Log
(
"=============== "
+
label
);
OpenCVTestRunner
.
Log
(
"================================================"
);
}
}
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
0 → 100644
浏览文件 @
ec6fb0be
package
org.opencv.test
;
import
java.io.FileOutputStream
;
import
java.util.Collections
;
import
java.util.List
;
import
junit.framework.TestCase
;
import
android.content.Context
;
import
android.graphics.Bitmap
;
import
android.graphics.Bitmap.CompressFormat
;
import
android.graphics.BitmapFactory
;
import
android.test.AndroidTestRunner
;
import
android.test.InstrumentationTestRunner
;
import
android.util.Log
;
/**
* This only class is Android specific.
* The original idea about test order randomization is from marek.defecinski blog.
*/
public
class
OpenCVTestRunner
extends
InstrumentationTestRunner
{
public
static
String
LENA_PATH
=
"/data/data/org.opencv.test/files/lena.jpg"
;
private
AndroidTestRunner
androidTestRunner
;
private
static
String
TAG
=
"opencv_test_java"
;
static
public
void
Log
(
String
message
)
{
Log
.
e
(
TAG
,
message
);
}
@Override
public
void
onStart
()
{
ExportLena
();
List
<
TestCase
>
testCases
=
androidTestRunner
.
getTestCases
();
Collections
.
shuffle
(
testCases
);
//shuffle the tests order
super
.
onStart
();
}
@Override
protected
AndroidTestRunner
getAndroidTestRunner
()
{
androidTestRunner
=
super
.
getAndroidTestRunner
();
return
androidTestRunner
;
}
private
void
ExportLena
()
{
try
{
Bitmap
mBitmap
=
BitmapFactory
.
decodeResource
(
this
.
getContext
().
getResources
(),
R
.
drawable
.
lena
);
FileOutputStream
fos
=
this
.
getContext
().
openFileOutput
(
"lena.jpg"
,
Context
.
MODE_WORLD_READABLE
);
mBitmap
.
compress
(
CompressFormat
.
JPEG
,
100
,
fos
);
fos
.
flush
();
fos
.
close
();
}
catch
(
Exception
e
)
{
Log
(
"Tried to write lena.jpg, but: "
+
e
.
toString
());
}
}
}
modules/java/android_test/src/org/opencv/test/coreTest.java
浏览文件 @
ec6fb0be
...
...
@@ -35,8 +35,9 @@ public class coreTest extends OpenCVTestCase {
}
public
void
testAddWeightedMatDoubleMatDoubleDoubleMatInt
()
{
core
.
addWeighted
(
gray1
,
126.0
,
gray127
,
1.0
,
2.0
,
dst
,
gray255_32f
.
depth
());
assertTrue
(
core
.
CV_32F
==
dst
.
depth
());
fail
(
"Not yet implemented"
);
//core.addWeighted(gray1, 126.0, gray127, 1.0, 2.0, dst, gray255_32f.depth());
//assertTrue(core.CV_32F == dst.depth());
}
public
void
testBitwise_andMatMatMat
()
{
...
...
modules/java/android_test/src/org/opencv/test/highguiTest.java
浏览文件 @
ec6fb0be
...
...
@@ -31,7 +31,7 @@ public class highguiTest extends OpenCVTestCase {
}
public
void
testImreadString
()
{
dst
=
highgui
.
imread
(
LENA
);
dst
=
highgui
.
imread
(
OpenCVTestRunner
.
LENA_PATH
);
assertTrue
(!
dst
.
empty
());
assertEquals
(
3
,
dst
.
channels
());
assertTrue
(
512
==
dst
.
cols
());
...
...
@@ -39,7 +39,7 @@ public class highguiTest extends OpenCVTestCase {
}
public
void
testImreadStringInt
()
{
dst
=
highgui
.
imread
(
LENA
,
0
);
dst
=
highgui
.
imread
(
OpenCVTestRunner
.
LENA_PATH
,
0
);
assertTrue
(!
dst
.
empty
());
assertEquals
(
1
,
dst
.
channels
());
assertTrue
(
512
==
dst
.
cols
());
...
...
modules/java/android_test/src/org/opencv/test/utils.java
已删除
100644 → 0
浏览文件 @
3fc87907
package
org.opencv.test
;
import
java.io.FileOutputStream
;
import
android.content.Context
;
import
android.graphics.Bitmap
;
import
android.graphics.BitmapFactory
;
import
android.graphics.Bitmap.CompressFormat
;
import
android.test.AndroidTestCase
;
import
android.util.Log
;
public
class
utils
extends
AndroidTestCase
{
static
String
TAG
=
"opencv_test_java"
;
static
public
void
Log
(
String
message
)
{
Log
.
e
(
TAG
,
message
);
}
public
void
ExportLena
()
{
//TODO: can we run this code just once, not for every test case?
try
{
Bitmap
mBitmap
=
BitmapFactory
.
decodeResource
(
this
.
getContext
().
getResources
(),
R
.
drawable
.
lena
);
FileOutputStream
fos
=
this
.
getContext
().
openFileOutput
(
"lena.jpg"
,
Context
.
MODE_WORLD_READABLE
);
mBitmap
.
compress
(
CompressFormat
.
JPEG
,
100
,
fos
);
fos
.
flush
();
fos
.
close
();
}
catch
(
Exception
e
)
{
Log
.
e
(
TAG
,
"Tried to write lena.jpg, but: "
+
e
.
toString
());
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录