Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Side by Side Diff: remoting/android/javatests/src/org/chromium/chromoting/TouchInputStrategyTest.java

Issue 1537183002: Refactor Chromoting JNI code to use jni/Client (Java changes only). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Suppress FindBugs warning Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chromoting; 5 package org.chromium.chromoting;
6 6
7 import android.graphics.Point; 7 import android.graphics.Point;
8 import android.test.InstrumentationTestCase; 8 import android.test.InstrumentationTestCase;
9 import android.test.suitebuilder.annotation.SmallTest; 9 import android.test.suitebuilder.annotation.SmallTest;
10 import android.view.MotionEvent; 10 import android.view.MotionEvent;
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 private void injectUpEvent(int id) { 190 private void injectUpEvent(int id) {
191 MotionEvent event = mEventGenerator.obtainUpEvent(id); 191 MotionEvent event = mEventGenerator.obtainUpEvent(id);
192 mInputStrategy.onMotionEvent(event); 192 mInputStrategy.onMotionEvent(event);
193 event.recycle(); 193 event.recycle();
194 } 194 }
195 195
196 @Override 196 @Override
197 public void setUp() { 197 public void setUp() {
198 mRenderData = new RenderData(); 198 mRenderData = new RenderData();
199 mRemoteInputInjector = new MockRemoteInputInjector(); 199 mRemoteInputInjector = new MockRemoteInputInjector();
200 mInputStrategy = new TouchInputStrategy(mRenderData); 200
201 // TODO(lambroslambrou): Provide a mock Client implementation that doesn 't call out to JNI,
202 // and mock the Client methods instead of using MockRemoteInputInjector here.
203 mInputStrategy = new TouchInputStrategy(mRenderData, null);
201 mInputStrategy.setRemoteInputInjectorForTest(mRemoteInputInjector); 204 mInputStrategy.setRemoteInputInjectorForTest(mRemoteInputInjector);
202 mEventGenerator = new TouchEventGenerator(); 205 mEventGenerator = new TouchEventGenerator();
203 206
204 mRenderData.screenWidth = SCREEN_SIZE_PX; 207 mRenderData.screenWidth = SCREEN_SIZE_PX;
205 mRenderData.screenHeight = SCREEN_SIZE_PX; 208 mRenderData.screenHeight = SCREEN_SIZE_PX;
206 mRenderData.imageWidth = REMOTE_DESKTOP_SIZE_PX; 209 mRenderData.imageWidth = REMOTE_DESKTOP_SIZE_PX;
207 mRenderData.imageHeight = REMOTE_DESKTOP_SIZE_PX; 210 mRenderData.imageHeight = REMOTE_DESKTOP_SIZE_PX;
208 mRenderData.transform.postTranslate(-TRANSLATE_OFFSET_PX, -TRANSLATE_OFF SET_PX); 211 mRenderData.transform.postTranslate(-TRANSLATE_OFFSET_PX, -TRANSLATE_OFF SET_PX);
209 } 212 }
210 213
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 for (int i = 0; i < 10000; i++) { 525 for (int i = 0; i < 10000; i++) {
523 injectMoveEvent(0, fingerOnePosX, i % 10); 526 injectMoveEvent(0, fingerOnePosX, i % 10);
524 injectMoveEvent(1, fingerTwoPosX, i % 10); 527 injectMoveEvent(1, fingerTwoPosX, i % 10);
525 } 528 }
526 mRemoteInputInjector.assertNothingInjected(); 529 mRemoteInputInjector.assertNothingInjected();
527 530
528 mInputStrategy.onScroll(0.0f, 0.0f); 531 mInputStrategy.onScroll(0.0f, 0.0f);
529 mRemoteInputInjector.assertNothingInjected(); 532 mRemoteInputInjector.assertNothingInjected();
530 } 533 }
531 } 534 }
OLDNEW
« no previous file with comments | « remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698