Skip to content

Commit 27a6feb

Browse files
developernotesdevelopernotes
committed
Correct package name and imports for android tests
1 parent 7377ea6 commit 27a6feb

18 files changed

+74
-81
lines changed

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/DatabaseStatementTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import android.content.Context;
2019
import android.database.Cursor;
21-
import org.sqlite.database.sqlite.SQLiteConstraintException;
22-
import org.sqlite.database.sqlite.SQLiteDatabase;
23-
import org.sqlite.database.sqlite.SQLiteDoneException;
24-
import org.sqlite.database.sqlite.SQLiteStatement;
2520
import android.test.AndroidTestCase;
2621
import android.test.PerformanceTestCase;
2722
import android.test.suitebuilder.annotation.MediumTest;
2823

24+
import net.zetetic.database.sqlcipher.SQLiteConstraintException;
25+
import net.zetetic.database.sqlcipher.SQLiteDatabase;
26+
import net.zetetic.database.sqlcipher.SQLiteDoneException;
27+
import net.zetetic.database.sqlcipher.SQLiteStatement;
28+
2929
import java.io.File;
3030

3131
/*

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteAbortExceptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import org.sqlite.database.sqlite.SQLiteAbortException;
19+
import net.zetetic.database.sqlcipher.SQLiteAbortException;
2020
import android.test.AndroidTestCase;
2121

2222
public class SQLiteAbortExceptionTest extends AndroidTestCase {

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteClosableTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import org.sqlite.database.sqlite.SQLiteClosable;
19+
import net.zetetic.database.sqlcipher.SQLiteClosable;
2020
import android.test.AndroidTestCase;
2121

2222
public class SQLiteClosableTest extends AndroidTestCase {

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteConstraintExceptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import org.sqlite.database.sqlite.SQLiteConstraintException;
19+
import net.zetetic.database.sqlcipher.SQLiteConstraintException;
2020
import android.test.AndroidTestCase;
2121

2222
public class SQLiteConstraintExceptionTest extends AndroidTestCase {

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteCursorTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

1919

20-
import android.content.Context;
2120
import android.database.AbstractCursor;
2221
import android.database.Cursor;
2322
import android.database.CursorWindow;
2423
import android.database.DataSetObserver;
2524
import android.database.StaleDataException;
26-
import org.sqlite.database.sqlite.SQLiteCursor;
27-
import org.sqlite.database.sqlite.SQLiteDatabase;
28-
import org.sqlite.database.sqlite.SQLiteDirectCursorDriver;
2925
import android.test.AndroidTestCase;
3026

27+
import net.zetetic.database.sqlcipher.SQLiteCursor;
28+
import net.zetetic.database.sqlcipher.SQLiteDatabase;
29+
import net.zetetic.database.sqlcipher.SQLiteDirectCursorDriver;
30+
3131
import java.io.File;
3232
import java.util.Arrays;
3333

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseCorruptExceptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

1919
import android.database.sqlite.SQLiteDatabaseCorruptException;
2020
import android.test.AndroidTestCase;

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseTest.java‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,26 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
18-
19-
import java.io.File;
20-
import java.io.IOException;
21-
import java.util.ArrayList;
22-
import java.util.Locale;
23-
import java.util.concurrent.Semaphore;
17+
package net.zetetic.database.sqlcipher_cts;
2418

2519
import android.content.ContentValues;
26-
import android.content.Context;
2720
import android.database.Cursor;
28-
import org.sqlite.database.DatabaseUtils;
29-
import org.sqlite.database.SQLException;
30-
import org.sqlite.database.sqlite.SQLiteCursor;
31-
import org.sqlite.database.sqlite.SQLiteCursorDriver;
32-
import org.sqlite.database.sqlite.SQLiteDatabase;
33-
import org.sqlite.database.sqlite.SQLiteDatabase.CursorFactory;
34-
import org.sqlite.database.sqlite.SQLiteException;
35-
import org.sqlite.database.sqlite.SQLiteQuery;
36-
import org.sqlite.database.sqlite.SQLiteStatement;
37-
import org.sqlite.database.sqlite.SQLiteTransactionListener;
3821
import android.test.AndroidTestCase;
39-
import android.test.MoreAsserts;
4022
import android.test.suitebuilder.annotation.LargeTest;
41-
import android.test.suitebuilder.annotation.SmallTest;
23+
24+
import net.zetetic.database.DatabaseUtils;
25+
import net.zetetic.database.SQLException;
26+
import net.zetetic.database.sqlcipher.SQLiteCursor;
27+
import net.zetetic.database.sqlcipher.SQLiteCursorDriver;
28+
import net.zetetic.database.sqlcipher.SQLiteDatabase;
29+
import net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory;
30+
import net.zetetic.database.sqlcipher.SQLiteQuery;
31+
import net.zetetic.database.sqlcipher.SQLiteStatement;
32+
import net.zetetic.database.sqlcipher.SQLiteTransactionListener;
33+
34+
import java.io.File;
35+
import java.io.IOException;
36+
import java.util.concurrent.Semaphore;
4237

4338
public class SQLiteDatabaseTest extends AndroidTestCase {
4439
private SQLiteDatabase mDatabase;

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDiskIOExceptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import org.sqlite.database.sqlite.SQLiteDiskIOException;
19+
import net.zetetic.database.sqlcipher.SQLiteDiskIOException;
2020
import android.test.AndroidTestCase;
2121

2222
public class SQLiteDiskIOExceptionTest extends AndroidTestCase {

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDoneExceptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import org.sqlite.database.sqlite.SQLiteDoneException;
19+
import net.zetetic.database.sqlcipher.SQLiteDoneException;
2020
import android.test.AndroidTestCase;
2121

2222
public class SQLiteDoneExceptionTest extends AndroidTestCase {

‎sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteExceptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.sqlite.database.sqlite_cts;
17+
package net.zetetic.database.sqlcipher_cts;
1818

19-
import org.sqlite.database.sqlite.SQLiteException;
19+
import net.zetetic.database.sqlcipher.SQLiteException;
2020
import android.test.AndroidTestCase;
2121

2222
public class SQLiteExceptionTest extends AndroidTestCase {

0 commit comments

Comments
 (0)