Skip to content

Commit d74db4c

Browse files
developernotesdevelopernotes
committed
Adding test for full text search
1 parent c02b52d commit d74db4c

File tree

5 files changed

+94
-41
lines changed

5 files changed

+94
-41
lines changed

‎gen/net/zetetic/BuildConfig.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/** Automatically generated file. DO NOT MODIFY */
2+
package net.zetetic;
3+
4+
public final class BuildConfig {
5+
public final static boolean DEBUG = true;
6+
}

‎net.zetetic.sqlcipher.test.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
3636
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" isTestSource="false" />
3737
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
3839
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
3940
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
4041
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,10 @@
7575
</component>
7676
<component name="FileEditorManager">
7777
<leaf>
78-
<file leaf-file-name="ImportUnencryptedDatabaseTest.java" pinned="false" current="false" current-in-tab="false">
79-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
80-
<provider selected="true" editor-type-id="text-editor">
81-
<state line="18" column="0" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0">
82-
<folding />
83-
</state>
84-
</provider>
85-
</entry>
86-
</file>
8778
<file leaf-file-name="SQLCipherTest.java" pinned="false" current="false" current-in-tab="false">
8879
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
8980
<provider selected="true" editor-type-id="text-editor">
90-
<state line="27" column="0" selection-start="768" selection-end="768" vertical-scroll-proportion="0.0">
81+
<state line="42" column="56" selection-start="1232" selection-end="1232" vertical-scroll-proportion="0.0">
9182
<folding />
9283
</state>
9384
</provider>
@@ -105,17 +96,19 @@
10596
<file leaf-file-name="TestSuiteRunner.java" pinned="false" current="true" current-in-tab="true">
10697
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
10798
<provider selected="true" editor-type-id="text-editor">
108-
<state line="35" column="54" selection-start="933" selection-end="933" vertical-scroll-proportion="0.4065934">
99+
<state line="56" column="44" selection-start="1866" selection-end="1866" vertical-scroll-proportion="0.96043956">
109100
<folding />
110101
</state>
111102
</provider>
112103
</entry>
113104
</file>
114-
<file leaf-file-name="ZeteticApplication.java" pinned="false" current="false" current-in-tab="false">
115-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
105+
<file leaf-file-name="FullTextSearchTest.java" pinned="false" current="false" current-in-tab="false">
106+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/FullTextSearchTest.java">
116107
<provider selected="true" editor-type-id="text-editor">
117-
<state line="58" column="5" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.0">
118-
<folding />
108+
<state line="15" column="22" selection-start="610" selection-end="610" vertical-scroll-proportion="0.0">
109+
<folding>
110+
<element signature="imports" expanded="true" />
111+
</folding>
119112
</state>
120113
</provider>
121114
</entry>
@@ -139,7 +132,6 @@
139132
<component name="IdeDocumentHistory">
140133
<option name="changedFiles">
141134
<list>
142-
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecExceptionTest.java" />
143135
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecSQLExceptionTest.java" />
144136
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecSQLTest.java" />
145137
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java" />
@@ -154,6 +146,7 @@
154146
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java" />
155147
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java" />
156148
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java" />
149+
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/FullTextSearchTest.java" />
157150
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java" />
158151
</list>
159152
</option>
@@ -419,7 +412,7 @@
419412
<recent name="net.zetetic.tests" />
420413
</key>
421414
</component>
422-
<component name="RunManager" selected="Android Application.emulator-4.0.3">
415+
<component name="RunManager" selected="Android Application.emulator-2.1">
423416
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
424417
<module name="" />
425418
<option name="TESTING_TYPE" value="0" />
@@ -762,6 +755,7 @@
762755
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6307364" sideWeight="0.07692308" order="13" side_tool="true" content_ui="tabs" />
763756
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
764757
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
758+
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32230523" sideWeight="0.46650276" order="10" side_tool="false" content_ui="tabs" />
765759
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6307364" sideWeight="0.91933763" order="8" side_tool="false" content_ui="tabs" />
766760
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32800853" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
767761
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
@@ -772,7 +766,6 @@
772766
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
773767
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
774768
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977587" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
775-
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32230523" sideWeight="0.46650276" order="10" side_tool="false" content_ui="tabs" />
776769
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
777770
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
778771
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -838,11 +831,6 @@
838831
<option name="FILTER_TARGETS" value="false" />
839832
</component>
840833
<component name="editorHistoryManager">
841-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticContentProvider.java">
842-
<provider selected="true" editor-type-id="text-editor">
843-
<state line="29" column="0" selection-start="743" selection-end="743" vertical-scroll-proportion="0.43421054" />
844-
</provider>
845-
</entry>
846834
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AES128CipherTest.java">
847835
<provider selected="true" editor-type-id="text-editor">
848836
<state line="34" column="61" selection-start="1025" selection-end="1025" vertical-scroll-proportion="0.58651686" />
@@ -858,11 +846,6 @@
858846
<state line="9" column="13" selection-start="241" selection-end="241" vertical-scroll-proportion="0.15824176" />
859847
</provider>
860848
</entry>
861-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/LoopingQueryTest.java">
862-
<provider selected="true" editor-type-id="text-editor">
863-
<state line="15" column="14" selection-start="517" selection-end="517" vertical-scroll-proportion="0.35492957" />
864-
</provider>
865-
</entry>
866849
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java">
867850
<provider selected="true" editor-type-id="text-editor">
868851
<state line="25" column="20" selection-start="1107" selection-end="1107" vertical-scroll-proportion="0.43516484" />
@@ -878,44 +861,68 @@
878861
<state line="15" column="42" selection-start="577" selection-end="577" vertical-scroll-proportion="0.2967033" />
879862
</provider>
880863
</entry>
881-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
864+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
882865
<provider selected="true" editor-type-id="text-editor">
883-
<state line="8" column="0" selection-start="228" selection-end="228" vertical-scroll-proportion="0.13846155" />
866+
<state line="25" column="31" selection-start="1097" selection-end="1097" vertical-scroll-proportion="0.6289517" />
884867
</provider>
885868
</entry>
886-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
869+
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
887870
<provider selected="true" editor-type-id="text-editor">
888-
<state line="25" column="31" selection-start="1097" selection-end="1097" vertical-scroll-proportion="0.6289517" />
871+
<state line="16" column="0" selection-start="814" selection-end="814" vertical-scroll-proportion="0.0" />
872+
</provider>
873+
</entry>
874+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
875+
<provider selected="true" editor-type-id="text-editor">
876+
<state line="15" column="112" selection-start="456" selection-end="456" vertical-scroll-proportion="0.0" />
889877
</provider>
890878
</entry>
891879
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
892880
<provider selected="true" editor-type-id="text-editor">
893-
<state line="18" column="0" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0" />
881+
<state line="18" column="0" selection-start="550" selection-end="550" vertical-scroll-proportion="0.14864865">
882+
<folding />
883+
</state>
894884
</provider>
895885
</entry>
896-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
886+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
897887
<provider selected="true" editor-type-id="text-editor">
898-
<state line="27" column="0" selection-start="768" selection-end="768" vertical-scroll-proportion="0.0" />
888+
<state line="8" column="0" selection-start="228" selection-end="228" vertical-scroll-proportion="0.1418919">
889+
<folding />
890+
</state>
899891
</provider>
900892
</entry>
901-
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
893+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/LoopingQueryTest.java">
902894
<provider selected="true" editor-type-id="text-editor">
903-
<state line="16" column="0" selection-start="814" selection-end="814" vertical-scroll-proportion="0.0" />
895+
<state line="15" column="14" selection-start="517" selection-end="517" vertical-scroll-proportion="0.2769231">
896+
<folding />
897+
</state>
898+
</provider>
899+
</entry>
900+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
901+
<provider selected="true" editor-type-id="text-editor">
902+
<state line="42" column="56" selection-start="1232" selection-end="1232" vertical-scroll-proportion="0.0">
903+
<folding />
904+
</state>
904905
</provider>
905906
</entry>
906907
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
907908
<provider selected="true" editor-type-id="text-editor">
908-
<state line="58" column="5" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.0" />
909+
<state line="40" column="26" selection-start="1086" selection-end="1086" vertical-scroll-proportion="0.36703297">
910+
<folding />
911+
</state>
909912
</provider>
910913
</entry>
911-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
914+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/FullTextSearchTest.java">
912915
<provider selected="true" editor-type-id="text-editor">
913-
<state line="15" column="112" selection-start="456" selection-end="456" vertical-scroll-proportion="0.0" />
916+
<state line="15" column="22" selection-start="610" selection-end="610" vertical-scroll-proportion="0.0">
917+
<folding>
918+
<element signature="imports" expanded="true" />
919+
</folding>
920+
</state>
914921
</provider>
915922
</entry>
916923
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
917924
<provider selected="true" editor-type-id="text-editor">
918-
<state line="35" column="54" selection-start="933" selection-end="933" vertical-scroll-proportion="0.4065934">
925+
<state line="56" column="44" selection-start="1866" selection-end="1866" vertical-scroll-proportion="0.96043956">
919926
<folding />
920927
</state>
921928
</provider>

‎src/main/java/net/zetetic/tests/FullTextSearchTest.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package net.zetetic.tests;
2+
3+
import android.database.Cursor;
4+
import net.sqlcipher.database.SQLiteDatabase;
5+
6+
public class FullTextSearchTest extends SQLCipherTest {
7+
8+
@Override
9+
public boolean execute(SQLiteDatabase database) {
10+
11+
database.execSQL("CREATE VIRTUAL TABLE sites USING fts4(domain, url, title, meta_keys, body)");
12+
database.execSQL("CREATE TABLE keywords (keyword TEXT)");
13+
14+
database.execSQL("insert into sites(domain, url, title, meta_keys, body) values(?, ?, ?, ?, ?)",
15+
new Object[]{"sqlcipher.net", "http://sqlcipher.net",
16+
"Home - SQLCipher - Open Source Full Database Encryption for SQLite",
17+
"sqlcipher, sqlite", ""});
18+
database.execSQL("insert into keywords(keyword) values(?)", new Object[]{"SQLCipher"});
19+
database.execSQL("insert into keywords(keyword) values(?)", new Object[]{"SQLite"});
20+
21+
String query = "SELECT keyword FROM keywords INNER JOIN sites ON sites.title MATCH keywords.keyword";
22+
Cursor result = database.rawQuery(query, new String[]{});
23+
int resultCount = 0;
24+
while (result.moveToNext()){
25+
String row = result.getString(0);
26+
if(row != null){
27+
resultCount++;
28+
}
29+
}
30+
result.close();
31+
return resultCount > 0;
32+
}
33+
34+
@Override
35+
public String getName() {
36+
return "Full Text Search Test";
37+
}
38+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ private List<SQLCipherTest> getTestsToRun(){
5454
tests.add(new StatusMemoryUsedTest());
5555
tests.add(new PragmaCipherVersionTest());
5656
tests.add(new ImportUnencryptedDatabaseTest());
57+
tests.add(new FullTextSearchTest());
5758
return tests;
5859
}
5960
}

0 commit comments

Comments
 (0)