Messaging: Remove tests
Nobody runs them anyway Change-Id: I2b07847509269af31430abc6cb0fb190f08d45f9
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
* Copyright (C) 2024 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -44,7 +45,6 @@ import com.android.messaging.util.LogUtil;
|
||||
import com.android.messaging.util.OsUtil;
|
||||
import com.android.messaging.util.PhoneUtils;
|
||||
import com.android.messaging.util.Trace;
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.Thread.UncaughtExceptionHandler;
|
||||
@@ -56,32 +56,13 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
|
||||
private static final String TAG = LogUtil.BUGLE_TAG;
|
||||
|
||||
private UncaughtExceptionHandler sSystemUncaughtExceptionHandler;
|
||||
private static boolean sRunningTests = false;
|
||||
|
||||
@VisibleForTesting
|
||||
protected static void setTestsRunning() {
|
||||
sRunningTests = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if we're running unit tests.
|
||||
*/
|
||||
public static boolean isRunningTests() {
|
||||
return sRunningTests;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
Trace.beginSection("app.onCreate");
|
||||
super.onCreate();
|
||||
|
||||
// Note onCreate is called in both test and real application environments
|
||||
if (!sRunningTests) {
|
||||
// Only create the factory if not running tests
|
||||
FactoryImpl.register(getApplicationContext(), this);
|
||||
} else {
|
||||
LogUtil.e(TAG, "BugleApplication.onCreate: FactoryImpl.register skipped for test run");
|
||||
}
|
||||
FactoryImpl.register(getApplicationContext(), this);
|
||||
|
||||
sSystemUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
|
||||
Thread.setDefaultUncaughtExceptionHandler(this);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
* Copyright (C) 2024 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -23,7 +24,6 @@ import android.database.sqlite.SQLiteDatabase;
|
||||
import android.database.sqlite.SQLiteOpenHelper;
|
||||
import android.provider.BaseColumns;
|
||||
|
||||
import com.android.messaging.BugleApplication;
|
||||
import com.android.messaging.R;
|
||||
import com.android.messaging.datamodel.data.ConversationListItemData;
|
||||
import com.android.messaging.datamodel.data.MessageData;
|
||||
@@ -31,7 +31,6 @@ import com.android.messaging.datamodel.data.ParticipantData;
|
||||
import com.android.messaging.util.Assert;
|
||||
import com.android.messaging.util.Assert.DoesNotRunOnMainThread;
|
||||
import com.android.messaging.util.LogUtil;
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
|
||||
/**
|
||||
* TODO: Open Issues:
|
||||
@@ -586,18 +585,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
|
||||
mApplicationContext = context;
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method that always instantiates a new DatabaseHelper instance. This should
|
||||
* be used ONLY by the tests and never by the real application.
|
||||
* @param context Test context.
|
||||
* @return Brand new DatabaseHelper instance.
|
||||
*/
|
||||
@VisibleForTesting
|
||||
static DatabaseHelper getNewInstanceForTest(final Context context) {
|
||||
Assert.isTrue(BugleApplication.isRunningTests());
|
||||
return new DatabaseHelper(context);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the (singleton) instance of @{link DatabaseWrapper}.
|
||||
* <p>The database is always opened as a writeable database.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
* Copyright (C) 2024 The LineageOS Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -26,7 +27,6 @@ import android.net.Uri;
|
||||
import android.os.ParcelFileDescriptor;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.messaging.BugleApplication;
|
||||
import com.android.messaging.Factory;
|
||||
import com.android.messaging.datamodel.DatabaseHelper.ConversationColumns;
|
||||
import com.android.messaging.datamodel.DatabaseHelper.ConversationParticipantsColumns;
|
||||
@@ -35,7 +35,6 @@ import com.android.messaging.datamodel.data.ConversationListItemData;
|
||||
import com.android.messaging.datamodel.data.ConversationMessageData;
|
||||
import com.android.messaging.datamodel.data.MessageData;
|
||||
import com.android.messaging.datamodel.data.ParticipantData;
|
||||
import com.android.messaging.util.Assert;
|
||||
import com.android.messaging.util.LogUtil;
|
||||
import com.android.messaging.util.OsUtil;
|
||||
import com.android.messaging.util.PhoneUtils;
|
||||
@@ -244,12 +243,6 @@ public class MessagingContentProvider extends ContentProvider {
|
||||
super();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public void setDatabaseForTest(final DatabaseWrapper db) {
|
||||
Assert.isTrue(BugleApplication.isRunningTests());
|
||||
mDatabaseWrapper = db;
|
||||
}
|
||||
|
||||
private DatabaseWrapper getDatabaseWrapper() {
|
||||
if (mDatabaseWrapper == null) {
|
||||
mDatabaseWrapper = mDatabaseHelper.getDatabase();
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.messaging.ui;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.os.Bundle;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import android.view.View;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import com.android.messaging.R;
|
||||
import com.android.messaging.util.LogUtil;
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
|
||||
/**
|
||||
* An empty activity that can be used to host a fragment or view for unit testing purposes. Lives in
|
||||
* app code vs test code due to requirement of ActivityInstrumentationTestCase2.
|
||||
*/
|
||||
public class TestActivity extends FragmentActivity {
|
||||
private FragmentEventListener mFragmentEventListener;
|
||||
|
||||
public interface FragmentEventListener {
|
||||
public void onAttachFragment(Fragment fragment);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(final Bundle bundle) {
|
||||
super.onCreate(bundle);
|
||||
|
||||
if (bundle != null) {
|
||||
// The test case may have configured the fragment, and recreating the activity will
|
||||
// lose that configuration. The real activity is the only activity that would know
|
||||
// how to reapply that configuration.
|
||||
throw new IllegalStateException("TestActivity cannot get recreated");
|
||||
}
|
||||
|
||||
// There is a race condition, but this often makes it possible for tests to run with the
|
||||
// key guard up
|
||||
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
|
||||
WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
|
||||
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
|
||||
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
|
||||
|
||||
setContentView(R.layout.test_activity);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public void setFragment(final Fragment fragment) {
|
||||
LogUtil.i(LogUtil.BUGLE_TAG, "TestActivity.setFragment");
|
||||
getFragmentManager()
|
||||
.beginTransaction()
|
||||
.replace(R.id.test_content, fragment)
|
||||
.commit();
|
||||
getFragmentManager().executePendingTransactions();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public void setView(final View view) {
|
||||
LogUtil.i(LogUtil.BUGLE_TAG, "TestActivity.setView");
|
||||
((FrameLayout) findViewById(R.id.test_content)).addView(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttachFragment(final Fragment fragment) {
|
||||
if (mFragmentEventListener != null) {
|
||||
mFragmentEventListener.onAttachFragment(fragment);
|
||||
}
|
||||
}
|
||||
|
||||
public void setFragmentEventListener(final FragmentEventListener fragmentEventListener) {
|
||||
mFragmentEventListener = fragmentEventListener;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user