From 9c07451786fa57b9eea6497634019ba30f92cf29 Mon Sep 17 00:00:00 2001 From: Daniel Finchelstein Date: Tue, 24 Oct 2017 10:30:35 -0700 Subject: [PATCH] Rename files for consistency. Test: CTS (API2 tests) Change-Id: I8a079525499e564c438281fcf5b3ef8333925f5b --- ...=> CameraHalHdrplusPreferenceControllerV2.java} | 4 +-- .../DevelopmentSettingsDashboardFragment.java | 2 +- ...ameraHalHdrplusPreferenceControllerV2Test.java} | 42 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) rename src/com/android/settings/development/{CameraHalHdrPlusPreferenceControllerV2.java => CameraHalHdrplusPreferenceControllerV2.java} (96%) rename tests/robotests/src/com/android/settings/development/{CameraHalHdrPlusPreferenceControllerV2Test.java => CameraHalHdrplusPreferenceControllerV2Test.java} (75%) diff --git a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java b/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java similarity index 96% rename from src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java rename to src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java index 11ee6c78a1..b8828fe1d0 100644 --- a/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java +++ b/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java @@ -29,7 +29,7 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -public class CameraHalHdrPlusPreferenceControllerV2 extends +public class CameraHalHdrplusPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { @@ -45,7 +45,7 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends private SwitchPreference mPreference; - public CameraHalHdrPlusPreferenceControllerV2(Context context) { + public CameraHalHdrplusPreferenceControllerV2(Context context) { super(context); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index fa89ba40f7..d532136cd3 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -376,7 +376,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle)); controllers.add(new ConnectivityMonitorPreferenceControllerV2(context)); controllers.add(new CameraLaserSensorPreferenceControllerV2(context)); - controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context)); + controllers.add(new CameraHalHdrplusPreferenceControllerV2(context)); controllers.add(new WifiDisplayCertificationPreferenceController(context)); controllers.add(new WifiVerboseLoggingPreferenceController(context)); controllers.add(new WifiAggressiveHandoverPreferenceController(context)); diff --git a/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java similarity index 75% rename from tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java index f28fd6e267..e0e137c3b1 100644 --- a/tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java @@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {SettingsShadowSystemProperties.class}) -public class CameraHalHdrPlusPreferenceControllerV2Test { +public class CameraHalHdrplusPreferenceControllerV2Test { @Mock private PreferenceScreen mScreen; @@ -50,7 +50,7 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { private SwitchPreference mPreference; private Context mContext; - private CameraHalHdrPlusPreferenceControllerV2 mController; + private CameraHalHdrplusPreferenceControllerV2 mController; static final String USERDEBUG_BUILD = "userdebug"; @@ -58,7 +58,7 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = new CameraHalHdrPlusPreferenceControllerV2(mContext); + mController = new CameraHalHdrplusPreferenceControllerV2(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); mController.displayPreference(mScreen); @@ -73,18 +73,18 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { @Config(qualifiers = "mcc999") public void isAvailable_withConfigNoShowAndUserDebugBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); assertThat(mController.isAvailable()).isFalse(); } @Test - public void updateState_cameraHalHdrPlusEnabled_shouldCheckedPreference() { + public void updateState_cameraHalHdrplusEnabled_shouldCheckedPreference() { SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.ENABLED); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.ENABLED); SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -92,12 +92,12 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { } @Test - public void updateState_cameraHalHdrPlusEnabled_shouldUncheckedPreference() { + public void updateState_cameraHalHdrplusEnabled_shouldUncheckedPreference() { SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED); SettingsShadowSystemProperties.set( - CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -108,20 +108,20 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { public void onPreferenceChange_preferenceChecked_shouldEnableCameraHalHdrplus() { mController.onPreferenceChange(mPreference, true /* new value */); - assertThat(CameraHalHdrPlusPreferenceControllerV2.ENABLED).isEqualTo( + assertThat(CameraHalHdrplusPreferenceControllerV2.ENABLED).isEqualTo( SystemProperties.get( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED)); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED)); } @Test public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() { mController.onPreferenceChange(mPreference, false /* new value */); - assertThat(CameraHalHdrPlusPreferenceControllerV2.DISABLED).isEqualTo( + assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo( SystemProperties.get( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED)); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED)); } @Test @@ -137,9 +137,9 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); - assertThat(CameraHalHdrPlusPreferenceControllerV2.DISABLED).isEqualTo( + assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo( SystemProperties.get( - CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, - CameraHalHdrPlusPreferenceControllerV2.DISABLED)); + CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, + CameraHalHdrplusPreferenceControllerV2.DISABLED)); } } -- 2.11.0