Skip to content

Commit feecc0b

Browse files
Adding test for invoking a status query
1 parent 66389c3 commit feecc0b

File tree

7 files changed

+117
-78
lines changed

7 files changed

+117
-78
lines changed
252 Bytes
Binary file not shown.

libs/sqlcipher.jar

68 Bytes
Binary file not shown.

net.zetetic.sqlcipher.test.iml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
2121
<option name="GENERATE_UNSIGNED_APK" value="false" />
2222
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
23+
<option name="PACK_TEST_CODE" value="false" />
24+
<option name="RUN_PROGUARD" value="false" />
25+
<option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
26+
<resOverlayFolders />
2327
</configuration>
2428
</facet>
2529
</component>
@@ -29,16 +33,11 @@
2933
<content url="file://$MODULE_DIR$">
3034
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
3135
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" isTestSource="false" />
32-
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" isTestSource="false" />
3336
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
34-
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
35-
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
36-
<excludeFolder url="file://$MODULE_DIR$/target/android-classes" />
3737
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
38+
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
3839
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
3940
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
40-
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
41-
<excludeFolder url="file://$MODULE_DIR$/target/surefire" />
4241
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
4342
</content>
4443
<orderEntry type="sourceFolder" forTests="false" />

net.zetetic.sqlcipher.test.ipr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
</component>
66
<component name="CompilerConfiguration">
77
<option name="DEFAULT_COMPILER" value="Javac" />
8+
<excludeFromCompile>
9+
<directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
10+
<directory url="file://$PROJECT_DIR$/target/generated-sources/r" includeSubdirectories="true" />
11+
<directory url="file://$PROJECT_DIR$/target/generated-sources/aidl" includeSubdirectories="true" />
12+
</excludeFromCompile>
813
<resourceExtensions />
914
<wildcardResourcePatterns>
1015
<entry name="?*.properties" />

net.zetetic.sqlcipher.test.iws

Lines changed: 82 additions & 72 deletions
Large diffs are not rendered by default.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package net.zetetic.tests;
2+
3+
import net.sqlcipher.database.SQLiteDatabase;
4+
5+
public class StatusMemoryUsedTest extends SQLCipherTest {
6+
7+
public static final int SQLITE_STATUS_MEMORY_USED = 0;
8+
9+
@Override
10+
public boolean execute(SQLiteDatabase database) {
11+
12+
int originalMemory = database.status(SQLITE_STATUS_MEMORY_USED, false);
13+
database.execSQL("create table t1(a,b)");
14+
database.execSQL("insert into t1(a,b) values(?, ?)",
15+
new Object[]{"one for the money", "two for the show"});
16+
int currentMemory = database.status(SQLITE_STATUS_MEMORY_USED, false);
17+
return originalMemory != currentMemory;
18+
}
19+
20+
@Override
21+
public String getName() {
22+
return "Status Memory Used Test";
23+
}
24+
}

src/main/java/net/zetetic/tests/TestSuiteRunner.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ private List<SQLCipherTest> getTestsToRun(){
5151
tests.add(new RawExecSQLExceptionTest());
5252
tests.add(new AES128CipherTest());
5353
tests.add(new MigrationFromDatabaseFormat1To2());
54+
tests.add(new StatusMemoryUsedTest());
5455
return tests;
5556
}
5657
}

0 commit comments

Comments
 (0)