From 27a6feb8f7dbfdbaba0fefade2f9b2c414f50772 Mon Sep 17 00:00:00 2001 From: Nick Parker Date: Wed, 14 Jul 2021 12:52:41 -0500 Subject: [PATCH] Correct package name and imports for android tests --- .../sqlcipher_cts/DatabaseStatementTest.java | 12 +++--- .../SQLiteAbortExceptionTest.java | 4 +- .../sqlcipher_cts/SQLiteClosableTest.java | 4 +- .../SQLiteConstraintExceptionTest.java | 4 +- .../sqlcipher_cts/SQLiteCursorTest.java | 10 ++--- .../SQLiteDatabaseCorruptExceptionTest.java | 2 +- .../sqlcipher_cts/SQLiteDatabaseTest.java | 37 ++++++++----------- .../SQLiteDiskIOExceptionTest.java | 4 +- .../SQLiteDoneExceptionTest.java | 4 +- .../sqlcipher_cts/SQLiteExceptionTest.java | 4 +- .../database/sqlcipher_cts/SQLiteFtsTest.java | 6 +-- .../SQLiteFullExceptionTest.java | 4 +- .../SQLiteMisuseExceptionTest.java | 4 +- .../sqlcipher_cts/SQLiteOpenHelperTest.java | 15 ++++---- .../sqlcipher_cts/SQLiteProgramTest.java | 13 +++---- .../sqlcipher_cts/SQLiteQueryBuilderTest.java | 16 ++++---- .../sqlcipher_cts/SQLiteQueryTest.java | 2 +- .../sqlcipher_cts/SQLiteStatementTest.java | 12 +++--- 18 files changed, 75 insertions(+), 82 deletions(-) diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/DatabaseStatementTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/DatabaseStatementTest.java index 5823640..5cae43c 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/DatabaseStatementTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/DatabaseStatementTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import android.content.Context; import android.database.Cursor; -import org.sqlite.database.sqlite.SQLiteConstraintException; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteDoneException; -import org.sqlite.database.sqlite.SQLiteStatement; import android.test.AndroidTestCase; import android.test.PerformanceTestCase; import android.test.suitebuilder.annotation.MediumTest; +import net.zetetic.database.sqlcipher.SQLiteConstraintException; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDoneException; +import net.zetetic.database.sqlcipher.SQLiteStatement; + import java.io.File; /* diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteAbortExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteAbortExceptionTest.java index 0ffdea9..9b1f270 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteAbortExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteAbortExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteAbortException; +import net.zetetic.database.sqlcipher.SQLiteAbortException; import android.test.AndroidTestCase; public class SQLiteAbortExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteClosableTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteClosableTest.java index a29e687..b63795b 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteClosableTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteClosableTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteClosable; +import net.zetetic.database.sqlcipher.SQLiteClosable; import android.test.AndroidTestCase; public class SQLiteClosableTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteConstraintExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteConstraintExceptionTest.java index 5aeace8..d865256 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteConstraintExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteConstraintExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteConstraintException; +import net.zetetic.database.sqlcipher.SQLiteConstraintException; import android.test.AndroidTestCase; public class SQLiteConstraintExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteCursorTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteCursorTest.java index 4f8b6a5..8d71310 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteCursorTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteCursorTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import android.content.Context; import android.database.AbstractCursor; import android.database.Cursor; import android.database.CursorWindow; import android.database.DataSetObserver; import android.database.StaleDataException; -import org.sqlite.database.sqlite.SQLiteCursor; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteDirectCursorDriver; import android.test.AndroidTestCase; +import net.zetetic.database.sqlcipher.SQLiteCursor; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDirectCursorDriver; + import java.io.File; import java.util.Arrays; diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseCorruptExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseCorruptExceptionTest.java index 0e6e49e..f79bff8 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseCorruptExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseCorruptExceptionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; import android.database.sqlite.SQLiteDatabaseCorruptException; import android.test.AndroidTestCase; diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseTest.java index 0c55d3c..2d35bdc 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDatabaseTest.java @@ -14,32 +14,27 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; + +import android.content.ContentValues; +import android.database.Cursor; +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.LargeTest; + +import net.zetetic.database.DatabaseUtils; +import net.zetetic.database.SQLException; +import net.zetetic.database.sqlcipher.SQLiteCursor; +import net.zetetic.database.sqlcipher.SQLiteCursorDriver; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory; +import net.zetetic.database.sqlcipher.SQLiteQuery; +import net.zetetic.database.sqlcipher.SQLiteStatement; +import net.zetetic.database.sqlcipher.SQLiteTransactionListener; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.Locale; import java.util.concurrent.Semaphore; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import org.sqlite.database.DatabaseUtils; -import org.sqlite.database.SQLException; -import org.sqlite.database.sqlite.SQLiteCursor; -import org.sqlite.database.sqlite.SQLiteCursorDriver; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteDatabase.CursorFactory; -import org.sqlite.database.sqlite.SQLiteException; -import org.sqlite.database.sqlite.SQLiteQuery; -import org.sqlite.database.sqlite.SQLiteStatement; -import org.sqlite.database.sqlite.SQLiteTransactionListener; -import android.test.AndroidTestCase; -import android.test.MoreAsserts; -import android.test.suitebuilder.annotation.LargeTest; -import android.test.suitebuilder.annotation.SmallTest; - public class SQLiteDatabaseTest extends AndroidTestCase { private SQLiteDatabase mDatabase; private File mDatabaseFile; diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDiskIOExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDiskIOExceptionTest.java index 06245b8..ab3b361 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDiskIOExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDiskIOExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteDiskIOException; +import net.zetetic.database.sqlcipher.SQLiteDiskIOException; import android.test.AndroidTestCase; public class SQLiteDiskIOExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDoneExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDoneExceptionTest.java index 4e288cd..96d4cc6 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDoneExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteDoneExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteDoneException; +import net.zetetic.database.sqlcipher.SQLiteDoneException; import android.test.AndroidTestCase; public class SQLiteDoneExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteExceptionTest.java index b7220d1..7b79d85 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteException; +import net.zetetic.database.sqlcipher.SQLiteException; import android.test.AndroidTestCase; public class SQLiteExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFtsTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFtsTest.java index cff887e..c7b1fa4 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFtsTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFtsTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; import android.content.ContentValues; -import android.content.Context; import android.content.res.Resources; import android.database.Cursor; -import org.sqlite.database.sqlite.SQLiteDatabase; import android.test.AndroidTestCase; +import net.zetetic.database.sqlcipher.SQLiteDatabase; + import java.io.File; /** diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFullExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFullExceptionTest.java index 8db6795..d531dbc 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFullExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteFullExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteFullException; +import net.zetetic.database.sqlcipher.SQLiteFullException; import android.test.AndroidTestCase; public class SQLiteFullExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteMisuseExceptionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteMisuseExceptionTest.java index 60364da..e53731a 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteMisuseExceptionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteMisuseExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import org.sqlite.database.sqlite.SQLiteMisuseException; +import net.zetetic.database.sqlcipher.SQLiteMisuseException; import android.test.AndroidTestCase; public class SQLiteMisuseExceptionTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteOpenHelperTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteOpenHelperTest.java index b571522..8055c13 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteOpenHelperTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteOpenHelperTest.java @@ -14,19 +14,18 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; import android.content.Context; import android.database.Cursor; -import org.sqlite.database.sqlite.SQLiteCursor; -import org.sqlite.database.sqlite.SQLiteCursorDriver; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteOpenHelper; -import org.sqlite.database.sqlite.SQLiteQuery; -import org.sqlite.database.sqlite.SQLiteDatabase.CursorFactory; import android.test.AndroidTestCase; -import java.io.File; +import net.zetetic.database.sqlcipher.SQLiteCursor; +import net.zetetic.database.sqlcipher.SQLiteCursorDriver; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDatabase.CursorFactory; +import net.zetetic.database.sqlcipher.SQLiteOpenHelper; +import net.zetetic.database.sqlcipher.SQLiteQuery; /** * Test {@link SQLiteOpenHelper}. diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteProgramTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteProgramTest.java index 5d6c578..6696cfd 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteProgramTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteProgramTest.java @@ -14,19 +14,18 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import android.content.Context; import android.database.Cursor; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteDoneException; -import org.sqlite.database.sqlite.SQLiteException; -import org.sqlite.database.sqlite.SQLiteQuery; -import org.sqlite.database.sqlite.SQLiteStatement; import android.test.AndroidTestCase; import android.test.MoreAsserts; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDoneException; +import net.zetetic.database.sqlcipher.SQLiteException; +import net.zetetic.database.sqlcipher.SQLiteStatement; + import java.io.File; public class SQLiteProgramTest extends AndroidTestCase { diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryBuilderTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryBuilderTest.java index b0bfe8f..34b8f13 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryBuilderTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryBuilderTest.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; -import android.content.Context; import android.database.Cursor; -import org.sqlite.database.sqlite.SQLiteCursor; -import org.sqlite.database.sqlite.SQLiteCursorDriver; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteQuery; -import org.sqlite.database.sqlite.SQLiteQueryBuilder; import android.os.CancellationSignal; import android.os.OperationCanceledException; import android.test.AndroidTestCase; +import net.zetetic.database.sqlcipher.SQLiteCursor; +import net.zetetic.database.sqlcipher.SQLiteCursorDriver; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteQuery; +import net.zetetic.database.sqlcipher.SQLiteQueryBuilder; + +import java.io.File; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Semaphore; -import java.io.File; public class SQLiteQueryBuilderTest extends AndroidTestCase { private SQLiteDatabase mDatabase; diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryTest.java index 6afbda4..befb784 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteQueryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; import junit.framework.TestCase; diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteStatementTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteStatementTest.java index dd98914..ed0cdb7 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteStatementTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLiteStatementTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.sqlite.database.sqlite_cts; +package net.zetetic.database.sqlcipher_cts; import android.content.ContentValues; import android.database.Cursor; -import org.sqlite.database.DatabaseUtils; -import org.sqlite.database.SQLException; -import org.sqlite.database.sqlite.SQLiteDatabase; -import org.sqlite.database.sqlite.SQLiteDoneException; -import org.sqlite.database.sqlite.SQLiteStatement; +import net.zetetic.database.DatabaseUtils; +import net.zetetic.database.SQLException; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDoneException; +import net.zetetic.database.sqlcipher.SQLiteStatement; import android.os.ParcelFileDescriptor; import androidx.test.filters.Suppress; import android.test.AndroidTestCase;