Skip to content

Commit 4357356

Browse files
wherewherewherewhere
committed
Use raw string literal
1 parent eed5d75 commit 4357356

File tree

13 files changed

+732
-673
lines changed

13 files changed

+732
-673
lines changed

‎AdvancedSharpAdbClient.Tests/DeviceCommands/DeviceClientTexts.Async.cs

Lines changed: 64 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -138,28 +138,31 @@ public async Task DumpScreenWinRTAsyncTest()
138138
public async Task ClickAsyncTest()
139139
{
140140
DummyAdbClient client = new();
141-
client.Commands["shell:input tap 100 100"] = @"java.lang.SecurityException: Injecting to another application requires INJECT_EVENTS permission
142-
at android.os.Parcel.createExceptionOrNull(Parcel.java:2373)
143-
at android.os.Parcel.createException(Parcel.java:2357)
144-
at android.os.Parcel.readException(Parcel.java:2340)
145-
at android.os.Parcel.readException(Parcel.java:2282)
146-
at android.hardware.input.IInputManager$Stub$Proxy.injectInputEvent(IInputManager.java:946)
147-
at android.hardware.input.InputManager.injectInputEvent(InputManager.java:907)
148-
at com.android.commands.input.Input.injectMotionEvent(Input.java:397)
149-
at com.android.commands.input.Input.access$200(Input.java:41)
150-
at com.android.commands.input.Input$InputTap.sendTap(Input.java:223)
151-
at com.android.commands.input.Input$InputTap.run(Input.java:217)
152-
at com.android.commands.input.Input.onRun(Input.java:107)
153-
at com.android.internal.os.BaseCommand.run(BaseCommand.java:60)
154-
at com.android.commands.input.Input.main(Input.java:71)
155-
at com.android.internal.os.RuntimeInit.nativeFinishInit(Native Method)
156-
at com.android.internal.os.RuntimeInit.main(RuntimeInit.java:438)
157-
Caused by: android.os.RemoteException: Remote stack trace:
158-
at com.android.server.input.InputManagerService.injectInputEventInternal(InputManagerService.java:677)
159-
at com.android.server.input.InputManagerService.injectInputEvent(InputManagerService.java:651)
160-
at android.hardware.input.IInputManager$Stub.onTransact(IInputManager.java:430)
161-
at android.os.Binder.execTransactInternal(Binder.java:1165)
162-
at android.os.Binder.execTransact(Binder.java:1134)";
141+
client.Commands["shell:input tap 100 100"] =
142+
"""
143+
java.lang.SecurityException: Injecting to another application requires INJECT_EVENTS permission
144+
at android.os.Parcel.createExceptionOrNull(Parcel.java:2373)
145+
at android.os.Parcel.createException(Parcel.java:2357)
146+
at android.os.Parcel.readException(Parcel.java:2340)
147+
at android.os.Parcel.readException(Parcel.java:2282)
148+
at android.hardware.input.IInputManager$Stub$Proxy.injectInputEvent(IInputManager.java:946)
149+
at android.hardware.input.InputManager.injectInputEvent(InputManager.java:907)
150+
at com.android.commands.input.Input.injectMotionEvent(Input.java:397)
151+
at com.android.commands.input.Input.access$200(Input.java:41)
152+
at com.android.commands.input.Input$InputTap.sendTap(Input.java:223)
153+
at com.android.commands.input.Input$InputTap.run(Input.java:217)
154+
at com.android.commands.input.Input.onRun(Input.java:107)
155+
at com.android.internal.os.BaseCommand.run(BaseCommand.java:60)
156+
at com.android.commands.input.Input.main(Input.java:71)
157+
at com.android.internal.os.RuntimeInit.nativeFinishInit(Native Method)
158+
at com.android.internal.os.RuntimeInit.main(RuntimeInit.java:438)
159+
Caused by: android.os.RemoteException: Remote stack trace:
160+
at com.android.server.input.InputManagerService.injectInputEventInternal(InputManagerService.java:677)
161+
at com.android.server.input.InputManagerService.injectInputEvent(InputManagerService.java:651)
162+
at android.hardware.input.IInputManager$Stub.onTransact(IInputManager.java:430)
163+
at android.os.Binder.execTransactInternal(Binder.java:1165)
164+
at android.os.Binder.execTransact(Binder.java:1134)
165+
""";
163166

164167
JavaException exception = await Assert.ThrowsAsync<JavaException>(() => new DeviceClient(client, Device).ClickAsync(100, 100));
165168

@@ -168,27 +171,30 @@ at android.os.Binder.execTransactInternal(Binder.java:1165)
168171

169172
Assert.Equal("SecurityException", exception.JavaName);
170173
Assert.Equal("Injecting to another application requires INJECT_EVENTS permission", exception.Message);
171-
Assert.Equal(@" at android.os.Parcel.createExceptionOrNull(Parcel.java:2373)
172-
at android.os.Parcel.createException(Parcel.java:2357)
173-
at android.os.Parcel.readException(Parcel.java:2340)
174-
at android.os.Parcel.readException(Parcel.java:2282)
175-
at android.hardware.input.IInputManager$Stub$Proxy.injectInputEvent(IInputManager.java:946)
176-
at android.hardware.input.InputManager.injectInputEvent(InputManager.java:907)
177-
at com.android.commands.input.Input.injectMotionEvent(Input.java:397)
178-
at com.android.commands.input.Input.access$200(Input.java:41)
179-
at com.android.commands.input.Input$InputTap.sendTap(Input.java:223)
180-
at com.android.commands.input.Input$InputTap.run(Input.java:217)
181-
at com.android.commands.input.Input.onRun(Input.java:107)
182-
at com.android.internal.os.BaseCommand.run(BaseCommand.java:60)
183-
at com.android.commands.input.Input.main(Input.java:71)
184-
at com.android.internal.os.RuntimeInit.nativeFinishInit(Native Method)
185-
at com.android.internal.os.RuntimeInit.main(RuntimeInit.java:438)
186-
Caused by: android.os.RemoteException: Remote stack trace:
187-
at com.android.server.input.InputManagerService.injectInputEventInternal(InputManagerService.java:677)
188-
at com.android.server.input.InputManagerService.injectInputEvent(InputManagerService.java:651)
189-
at android.hardware.input.IInputManager$Stub.onTransact(IInputManager.java:430)
190-
at android.os.Binder.execTransactInternal(Binder.java:1165)
191-
at android.os.Binder.execTransact(Binder.java:1134)", exception.JavaStackTrace, ignoreLineEndingDifferences: true);
174+
Assert.Equal(
175+
"""
176+
at android.os.Parcel.createExceptionOrNull(Parcel.java:2373)
177+
at android.os.Parcel.createException(Parcel.java:2357)
178+
at android.os.Parcel.readException(Parcel.java:2340)
179+
at android.os.Parcel.readException(Parcel.java:2282)
180+
at android.hardware.input.IInputManager$Stub$Proxy.injectInputEvent(IInputManager.java:946)
181+
at android.hardware.input.InputManager.injectInputEvent(InputManager.java:907)
182+
at com.android.commands.input.Input.injectMotionEvent(Input.java:397)
183+
at com.android.commands.input.Input.access$200(Input.java:41)
184+
at com.android.commands.input.Input$InputTap.sendTap(Input.java:223)
185+
at com.android.commands.input.Input$InputTap.run(Input.java:217)
186+
at com.android.commands.input.Input.onRun(Input.java:107)
187+
at com.android.internal.os.BaseCommand.run(BaseCommand.java:60)
188+
at com.android.commands.input.Input.main(Input.java:71)
189+
at com.android.internal.os.RuntimeInit.nativeFinishInit(Native Method)
190+
at com.android.internal.os.RuntimeInit.main(RuntimeInit.java:438)
191+
Caused by: android.os.RemoteException: Remote stack trace:
192+
at com.android.server.input.InputManagerService.injectInputEventInternal(InputManagerService.java:677)
193+
at com.android.server.input.InputManagerService.injectInputEvent(InputManagerService.java:651)
194+
at android.hardware.input.IInputManager$Stub.onTransact(IInputManager.java:430)
195+
at android.os.Binder.execTransactInternal(Binder.java:1165)
196+
at android.os.Binder.execTransact(Binder.java:1134)
197+
""", exception.JavaStackTrace, ignoreLineEndingDifferences: true);
192198
}
193199

194200
/// <summary>
@@ -285,8 +291,11 @@ public async Task IsAppRunningAsyncTest(string response, bool expected)
285291
public async Task IsAppInForegroundAsyncTest(string packageName, bool expected)
286292
{
287293
DummyAdbClient client = new();
288-
client.Commands["shell:dumpsys activity activities | grep mResumedActivity"] = @" mResumedActivity: ActivityRecord{1f5309a u0 com.android.settings/.homepage.SettingsHomepageActivity t61029}
289-
mResumedActivity: ActivityRecord{896cc3 u0 app.lawnchair/.LawnchairLauncher t5}";
294+
client.Commands["shell:dumpsys activity activities | grep mResumedActivity"] =
295+
"""
296+
mResumedActivity: ActivityRecord{1f5309a u0 com.android.settings/.homepage.SettingsHomepageActivity t61029}
297+
mResumedActivity: ActivityRecord{896cc3 u0 app.lawnchair/.LawnchairLauncher t5}
298+
""";
290299

291300
bool result = await new DeviceClient(client, Device).IsAppInForegroundAsync(packageName);
292301

@@ -305,8 +314,11 @@ public async Task IsAppInForegroundAsyncTest(string packageName, bool expected)
305314
public async Task GetAppStatusAsyncTest(string packageName, string response, AppStatus expected)
306315
{
307316
DummyAdbClient client = new();
308-
client.Commands["shell:dumpsys activity activities | grep mResumedActivity"] = @" mResumedActivity: ActivityRecord{1f5309a u0 com.android.settings/.homepage.SettingsHomepageActivity t61029}
309-
mResumedActivity: ActivityRecord{896cc3 u0 app.lawnchair/.LawnchairLauncher t5}";
317+
client.Commands["shell:dumpsys activity activities | grep mResumedActivity"] =
318+
"""
319+
mResumedActivity: ActivityRecord{1f5309a u0 com.android.settings/.homepage.SettingsHomepageActivity t61029}
320+
mResumedActivity: ActivityRecord{896cc3 u0 app.lawnchair/.LawnchairLauncher t5}
321+
""";
310322
client.Commands[$"shell:pidof {packageName}"] = response;
311323

312324
AppStatus result = await new DeviceClient(client, Device).GetAppStatusAsync(packageName);
@@ -327,8 +339,11 @@ public async Task GetAppStatusAsyncTest(string packageName, string response, App
327339
public async Task GetAppStatusForegroundAsyncTest(string packageName, AppStatus expected)
328340
{
329341
DummyAdbClient client = new();
330-
client.Commands["shell:dumpsys activity activities | grep mResumedActivity"] = @" mResumedActivity: ActivityRecord{1f5309a u0 com.android.settings/.homepage.SettingsHomepageActivity t61029}
331-
mResumedActivity: ActivityRecord{896cc3 u0 app.lawnchair/.LawnchairLauncher t5}";
342+
client.Commands["shell:dumpsys activity activities | grep mResumedActivity"] =
343+
"""
344+
mResumedActivity: ActivityRecord{1f5309a u0 com.android.settings/.homepage.SettingsHomepageActivity t61029}
345+
mResumedActivity: ActivityRecord{896cc3 u0 app.lawnchair/.LawnchairLauncher t5}
346+
""";
332347

333348
AppStatus result = await new DeviceClient(client, Device).GetAppStatusAsync(packageName);
334349

0 commit comments

Comments
 (0)