Bug 1219058 - Part 2: Normalize Robocop test harness source layout. r=gbrown
☠☠ backed out by 47c3e7a902e5 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Tue, 27 Oct 2015 17:16:09 -0700
changeset 305206 0447429a562752888423291dc5b48cd6f4c66f62
parent 305205 fb5765dffe01e033113d0b013e5ae99c7cae0c74
child 305207 47c3e7a902e5412ac0cf24ca71dabbfa6a24044c
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1219058
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1219058 - Part 2: Normalize Robocop test harness source layout. r=gbrown Pretty straight-forward. The win here is that the directory is now sensible, so we don't need the robocop_harness symlink for the Gradle build configuration.
build/mobile/robocop/Actions.java
build/mobile/robocop/Assert.java
build/mobile/robocop/Driver.java
build/mobile/robocop/Element.java
build/mobile/robocop/FennecInstrumentationTestRunner.java
build/mobile/robocop/FennecMochitestAssert.java
build/mobile/robocop/FennecNativeActions.java
build/mobile/robocop/FennecNativeDriver.java
build/mobile/robocop/FennecNativeElement.java
build/mobile/robocop/FennecTalosAssert.java
build/mobile/robocop/LaunchFennecWithConfigurationActivity.java
build/mobile/robocop/Makefile.in
build/mobile/robocop/PaintedSurface.java
build/mobile/robocop/RoboCopException.java
build/mobile/robocop/RobocopShare1.java
build/mobile/robocop/RobocopShare2.java
build/mobile/robocop/RobocopUtils.java
build/mobile/robocop/StructuredLogger.java
mobile/android/gradle/app/build.gradle
mobile/android/mach_commands.py
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Actions.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Assert.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Driver.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Element.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecInstrumentationTestRunner.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecMochitestAssert.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeActions.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeDriver.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeElement.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecTalosAssert.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/LaunchFennecWithConfigurationActivity.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/PaintedSurface.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RoboCopException.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopShare1.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopShare2.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopUtils.java
mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/StructuredLogger.java
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -23,17 +23,17 @@ ANDROID_EXTRA_JARS += \
   RoboCopException.java \
   RobocopShare1.java \
   RobocopShare2.java \
   RobocopUtils.java \
   PaintedSurface.java \
   StructuredLogger.java \
   $(NULL)
 
-java-harness := $(addprefix $(srcdir)/,$(_JAVA_HARNESS))
+java-harness := $(addprefix $(topsrcdir)/mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/,$(_JAVA_HARNESS))
 java-tests   := \
   $(wildcard $(TESTPATH)/*.java) \
   $(wildcard $(TESTPATH)/components/*.java) \
   $(wildcard $(TESTPATH)/helpers/*.java)
 
 PP_TARGETS += manifest
 manifest := $(srcdir)/AndroidManifest.xml.in
 manifest_TARGET := export
--- a/mobile/android/gradle/app/build.gradle
+++ b/mobile/android/gradle/app/build.gradle
@@ -31,17 +31,16 @@ android {
     sourceSets {
         main {
             manifest.srcFile "${topobjdir}/mobile/android/base/AndroidManifest.xml"
         }
 
         androidTest {
             manifest.srcFile "${topobjdir}/build/mobile/robocop/AndroidManifest.xml"
             java {
-                srcDir "src/robocop_harness"
                 srcDir "src/robocop"
                 srcDir "src/background"
                 srcDir "src/browser"
                 srcDir "src/javaaddons"
             }
         }
     }
 }
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -110,17 +110,16 @@ class MachCommands(MachCommandBase):
         srcdir('omnijar/src/main/java/components', 'mobile/android/components')
         srcdir('omnijar/src/main/java/modules', 'mobile/android/modules')
         srcdir('omnijar/src/main/java/themes', 'mobile/android/themes')
 
         srcdir('app/build.gradle', 'mobile/android/gradle/app/build.gradle')
         srcdir('app/src/androidTest/res', 'build/mobile/robocop/res')
         srcdir('app/src/androidTest/assets', 'mobile/android/tests/browser/robocop/assets')
         # Test code.
-        srcdir('app/src/robocop_harness/org/mozilla/gecko', 'build/mobile/robocop')
         srcdir('app/src/robocop', 'mobile/android/tests/browser/robocop/src/androidTest/java')
         srcdir('app/src/background', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser', 'mobile/android/tests/browser/junit3/src')
         srcdir('app/src/javaaddons', 'mobile/android/tests/javaaddons/src')
         # Test libraries.
         srcdir('app/libs', 'build/mobile/robocop')
 
         srcdir('base/build.gradle', 'mobile/android/gradle/base/build.gradle')
rename from build/mobile/robocop/Actions.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Actions.java
rename from build/mobile/robocop/Assert.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Assert.java
rename from build/mobile/robocop/Driver.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Driver.java
rename from build/mobile/robocop/Element.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Element.java
rename from build/mobile/robocop/FennecInstrumentationTestRunner.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecInstrumentationTestRunner.java
rename from build/mobile/robocop/FennecMochitestAssert.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecMochitestAssert.java
rename from build/mobile/robocop/FennecNativeActions.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeActions.java
rename from build/mobile/robocop/FennecNativeDriver.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeDriver.java
rename from build/mobile/robocop/FennecNativeElement.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeElement.java
rename from build/mobile/robocop/FennecTalosAssert.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecTalosAssert.java
rename from build/mobile/robocop/LaunchFennecWithConfigurationActivity.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/LaunchFennecWithConfigurationActivity.java
rename from build/mobile/robocop/PaintedSurface.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/PaintedSurface.java
rename from build/mobile/robocop/RoboCopException.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RoboCopException.java
rename from build/mobile/robocop/RobocopShare1.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopShare1.java
rename from build/mobile/robocop/RobocopShare2.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopShare2.java
rename from build/mobile/robocop/RobocopUtils.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopUtils.java
rename from build/mobile/robocop/StructuredLogger.java
rename to mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/StructuredLogger.java