diff options
author | Zhihong Xu <zhihongx@google.com> | 2012-09-04 11:08:10 -0700 |
---|---|---|
committer | Jon Boekenoogen <jboekeno@google.com> | 2012-09-18 09:50:44 -0700 |
commit | f139aa4fee979823b0a806347f64a08a6a2477bb (patch) | |
tree | d0aecb7765e55a6e46c0fcaf3bd954c5cfb110ad | |
parent | c61ca12c178f4f4430523de2565e2b2b095d82e7 (diff) | |
download | robolectric-f139aa4fee979823b0a806347f64a08a6a2477bb.tar.gz |
fixed some indentations
6 files changed, 123 insertions, 123 deletions
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java index db0c44743..882766c3a 100644 --- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java +++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowComponentName.java @@ -1,7 +1,5 @@ package com.xtremelabs.robolectric.shadows; -import static com.xtremelabs.robolectric.Robolectric.shadowOf_; - import android.content.ComponentName; import android.content.Context; import android.os.Parcel; @@ -9,6 +7,8 @@ import android.os.Parcel; import com.xtremelabs.robolectric.internal.Implementation; import com.xtremelabs.robolectric.internal.Implements; +import static com.xtremelabs.robolectric.Robolectric.shadowOf_; + /** * Shadows the {@code android.content.ComponentName} class. * <p/> @@ -50,28 +50,28 @@ public class ShadowComponentName { @Implementation public static ComponentName readFromParcel(Parcel in) { - if (in.readInt() == 0) { - return null; - } - String pkg = in.readString(); - String cls = in.readString(); - return new ComponentName(pkg, cls); + if (in.readInt() == 0) { + return null; + } + String pkg = in.readString(); + String cls = in.readString(); + return new ComponentName(pkg, cls); } @Implementation public void writeToParcel(Parcel out, int flags) { - out.writeInt(1); - out.writeString(pkg); - out.writeString(cls); + out.writeInt(1); + out.writeString(pkg); + out.writeString(cls); } @Implementation public static void writeToParcel(ComponentName c, Parcel out) { - if (c == null) { - out.writeInt(0); - } else { - c.writeToParcel(out, 0); - } + if (c == null) { + out.writeInt(0); + } else { + c.writeToParcel(out, 0); + } } @Override @Implementation diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java index 9f24e740a..fa2ecf2e5 100644 --- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java +++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java @@ -608,39 +608,39 @@ public class ShadowIntent { @Implementation public void writeToParcel(Parcel out, int flags) { - out.writeString(action); - if (data != null) { - out.writeInt(1); - Uri.writeToParcel(out, data); - } else { - out.writeInt(0); - } - out.writeString(type); - out.writeInt(flags); - out.writeString(packageName); - ComponentName.writeToParcel(componentName, out); - out.writeInt(categories.size()); - for (String category : categories) { - out.writeString(category); - } - out.writeBundle(extras); + out.writeString(action); + if (data != null) { + out.writeInt(1); + Uri.writeToParcel(out, data); + } else { + out.writeInt(0); + } + out.writeString(type); + out.writeInt(flags); + out.writeString(packageName); + ComponentName.writeToParcel(componentName, out); + out.writeInt(categories.size()); + for (String category : categories) { + out.writeString(category); + } + out.writeBundle(extras); } @Implementation public void readFromParcel(Parcel in) { - setAction(in.readString()); - if (in.readInt() != 0) { - data = Uri.CREATOR.createFromParcel(in); - } - type = in.readString(); - flags = in.readInt(); - packageName = in.readString(); - componentName = ComponentName.readFromParcel(in); - int N = in.readInt(); - for (int i = 0; i < N; i++) { - categories.add(in.readString().intern()); - } - extras.putAll(in.readBundle()); + setAction(in.readString()); + if (in.readInt() != 0) { + data = Uri.CREATOR.createFromParcel(in); + } + type = in.readString(); + flags = in.readInt(); + packageName = in.readString(); + componentName = ComponentName.readFromParcel(in); + int N = in.readInt(); + for (int i = 0; i < N; i++) { + categories.add(in.readString().intern()); + } + extras.putAll(in.readBundle()); } private Serializable serializeCycle(Serializable serializable) { diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java index 3bc2ddefe..c851ec2f6 100644 --- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java +++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java @@ -65,41 +65,41 @@ public class ShadowPendingIntent { @Implementation public static void writePendingIntentOrNullToParcel(PendingIntent sender, Parcel out) { - if (sender == null) { + if (sender == null) { out.writeInt(0); return; - } - sender.writeToParcel(out, 0); + } + sender.writeToParcel(out, 0); } @Implementation public static PendingIntent readPendingIntentOrNullFromParcel(Parcel in) { - if (in.readInt() == 0) { + if (in.readInt() == 0) { return null; - } - boolean isActivity = readBooleanFromParcel(in); - boolean isBroadcast = readBooleanFromParcel(in); - boolean isService = readBooleanFromParcel(in); - int requestCode = in.readInt(); - Intent intent = null; - if (in.readInt() != 0) { + } + boolean isActivity = readBooleanFromParcel(in); + boolean isBroadcast = readBooleanFromParcel(in); + boolean isService = readBooleanFromParcel(in); + int requestCode = in.readInt(); + Intent intent = null; + if (in.readInt() != 0) { intent = new Intent(); intent.readFromParcel(in); - } - return create(null, intent, isActivity, isBroadcast, isService, requestCode); + } + return create(null, intent, isActivity, isBroadcast, isService, requestCode); } @Implementation public void writeToParcel(Parcel out, int flags) { - out.writeInt(1); - writeBooleanToParcel(isActivityIntent, out); - writeBooleanToParcel(isBroadcastIntent, out); - writeBooleanToParcel(isServiceIntent, out); - out.writeInt(requestCode); - if (savedIntent != null) { + out.writeInt(1); + writeBooleanToParcel(isActivityIntent, out); + writeBooleanToParcel(isBroadcastIntent, out); + writeBooleanToParcel(isServiceIntent, out); + out.writeInt(requestCode); + if (savedIntent != null) { out.writeInt(1); savedIntent.writeToParcel(out, flags); - } else { + } else { out.writeInt(0); } } @@ -120,36 +120,36 @@ public class ShadowPendingIntent { @Override @Implementation public boolean equals(Object obj) { - if (obj == null) { + if (obj == null) { return false; - } - if (obj instanceof PendingIntent) { + } + if (obj instanceof PendingIntent) { return shadowEquals(Robolectric.shadowOf((PendingIntent) obj)); - } - return false; + } + return false; } private boolean shadowEquals(ShadowPendingIntent other) { - if (isActivityIntent != other.isActivityIntent) { - return false; - } - if (isBroadcastIntent != other.isBroadcastIntent) { - return false; - } - if (isServiceIntent != other.isServiceIntent) { + if (isActivityIntent != other.isActivityIntent) { return false; - } - if (requestCode != other.requestCode) { + } + if (isBroadcastIntent != other.isBroadcastIntent) { return false; - } - if (savedIntent == null) { - if (other.savedIntent != null) { - return false; + } + if (isServiceIntent != other.isServiceIntent) { + return false; } - } else if (!savedIntent.equals(other.savedIntent)) { - return false; - } - return true; + if (requestCode != other.requestCode) { + return false; + } + if (savedIntent == null) { + if (other.savedIntent != null) { + return false; + } + } else if (!savedIntent.equals(other.savedIntent)) { + return false; + } + return true; } public boolean isActivityIntent() { @@ -189,10 +189,10 @@ public class ShadowPendingIntent { } private static void writeBooleanToParcel(boolean b, Parcel out) { - out.writeInt(b ? 1 : 0); + out.writeInt(b ? 1 : 0); } private static boolean readBooleanFromParcel(Parcel in) { - return in.readInt() != 0; + return in.readInt() != 0; } } diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java index 9bf4a7a91..88b3eb437 100644 --- a/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java +++ b/src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java @@ -402,43 +402,43 @@ public class IntentTest { @Test public void testParcelIo_explicitIntent() { - Intent intent = new Intent(new Activity(), getClass()); - putTestExtras(intent); - verifyIntentReadIsWhatWasWrittenToParcel(intent); + Intent intent = new Intent(new Activity(), getClass()); + putTestExtras(intent); + verifyIntentReadIsWhatWasWrittenToParcel(intent); } @Test public void testParcelIo_actionUri() { - Intent intent = new Intent("action"); - shadowOf(intent).setURI("http://foo"); - putTestExtras(intent); - verifyIntentReadIsWhatWasWrittenToParcel(intent); + Intent intent = new Intent("action"); + shadowOf(intent).setURI("http://foo"); + putTestExtras(intent); + verifyIntentReadIsWhatWasWrittenToParcel(intent); } @Test public void testParcelIo_actionTypeCategory() { - Intent intent = new Intent("action"); - intent.setType("type"); - intent.addCategory("category"); - verifyIntentReadIsWhatWasWrittenToParcel(intent); + Intent intent = new Intent("action"); + intent.setType("type"); + intent.addCategory("category"); + verifyIntentReadIsWhatWasWrittenToParcel(intent); } private void verifyIntentReadIsWhatWasWrittenToParcel(Intent expected) { - Parcel parcel = Parcel.obtain(); - expected.writeToParcel(parcel, 0); - Intent actual = new Intent(); - actual.readFromParcel(parcel); - assertThat(expected, equalTo(actual)); + Parcel parcel = Parcel.obtain(); + expected.writeToParcel(parcel, 0); + Intent actual = new Intent(); + actual.readFromParcel(parcel); + assertThat(expected, equalTo(actual)); } private void putTestExtras(Intent intent) { - intent.putExtra("boolean", true); - intent.putExtra("string", "string value"); - Bundle bundle = new Bundle(); - bundle.putDouble("bundle double", 3.14); - intent.putExtra("bundle", bundle); - int[] intArray = {1, 2, 3}; - intent.putExtra("int array", intArray); + intent.putExtra("boolean", true); + intent.putExtra("string", "string value"); + Bundle bundle = new Bundle(); + bundle.putDouble("bundle double", 3.14); + intent.putExtra("bundle", bundle); + int[] intArray = {1, 2, 3}; + intent.putExtra("int array", intArray); } private static class TestSerializable implements Serializable { diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java index 8072eb76b..ea781e2ab 100644 --- a/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java +++ b/src/test/java/com/xtremelabs/robolectric/shadows/ParcelTest.java @@ -69,8 +69,8 @@ public class ParcelTest { public void testWriteNullString() { parcel.writeString( null ); assertThat( parcel.readString(), nullValue() ); - assertThat( shadowParcel.getIndex(), equalTo( 1 ) ); - assertThat( shadowParcel.getParcelData().size(), equalTo( 1 ) ); + assertThat( shadowParcel.getIndex(), equalTo( 0 ) ); + assertThat( shadowParcel.getParcelData().size(), equalTo( 0 ) ); } @Test diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java index 33286e06a..add7b99f5 100644 --- a/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java +++ b/src/test/java/com/xtremelabs/robolectric/shadows/PendingIntentTest.java @@ -86,13 +86,13 @@ public class PendingIntentTest { @Test public void testEquals() throws Exception { - PendingIntent pi1 = PendingIntent.getActivity(Robolectric.application, 99, - new Intent("action"), 100); - PendingIntent pi2 = PendingIntent.getActivity(null, 99, new Intent("action"), 100); - PendingIntent pi3 = PendingIntent.getService(Robolectric.application, 99, - new Intent("action"), 100); - assertThat(pi1, equalTo(pi2)); - assertThat(pi1, not(equalTo(pi3))); + PendingIntent pi1 = PendingIntent.getActivity(Robolectric.application, 99, + new Intent("action"), 100); + PendingIntent pi2 = PendingIntent.getActivity(null, 99, new Intent("action"), 100); + PendingIntent pi3 = PendingIntent.getService(Robolectric.application, 99, + new Intent("action"), 100); + assertThat(pi1, equalTo(pi2)); + assertThat(pi1, not(equalTo(pi3))); } @Test @@ -129,9 +129,9 @@ public class PendingIntentTest { PendingIntent.writePendingIntentOrNullToParcel(expected, parcel); PendingIntent actual = PendingIntent.readPendingIntentOrNullFromParcel(parcel); if (expected == null) { - assertNull(actual); + assertNull(actual); } else { - assertThat(expected, equalTo(actual)); + assertThat(expected, equalTo(actual)); } } } |