Skip to content

Commit 11f370b

Browse files
authored
Merge pull request #347 from wix/fixAndroidUnitTests
Fix android unit tests
2 parents 4258a17 + 98f3da2 commit 11f370b

File tree

66 files changed

+931
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+931
-30
lines changed

android/.gitignore

-1
This file was deleted.
1 Byte
Binary file not shown.
924 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
342 KB
Binary file not shown.
6.09 MB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Tue Mar 05 16:05:24 EET 2019
2+
gradle.version=4.4
Binary file not shown.

android/.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>android</name>
4+
<comment>Project android created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

android/app/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/build
2+
google-services.json
Binary file not shown.
Binary file not shown.

android/app/.gradle/4.10/gc.properties

Whitespace-only changes.
Binary file not shown.

android/app/.gradle/5.5.1/gc.properties

Whitespace-only changes.

android/app/app.iml

+216
Large diffs are not rendered by default.

android/app/build.gradle

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apply plugin: 'com.android.library'
2+
apply from: '../prepare-robolectric.gradle'
3+
4+
android {
5+
compileSdkVersion 27
6+
buildToolsVersion '28.0.3'
7+
8+
defaultConfig {
9+
minSdkVersion 19
10+
targetSdkVersion 27
11+
versionCode 1
12+
versionName "1.0"
13+
}
14+
buildTypes {
15+
release {
16+
minifyEnabled false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
20+
}
21+
22+
dependencies {
23+
implementation 'com.google.firebase:firebase-core:16.0.0'
24+
implementation "com.google.firebase:firebase-messaging:17.3.0"
25+
implementation 'com.facebook.react:react-native:+'
26+
27+
// tests
28+
testImplementation 'junit:junit:4.12'
29+
testImplementation 'org.robolectric:robolectric:3.5.1'
30+
testImplementation 'org.assertj:assertj-core:3.8.0'
31+
testImplementation 'com.squareup.assertj:assertj-android:1.1.1'
32+
testImplementation 'org.mockito:mockito-core:2.13.0'
33+
}
34+
35+
apply plugin: 'com.google.gms.google-services'

android/app/local.properties

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## This file must *NOT* be checked into Version Control Systems,
2+
# as it contains information specific to your local configuration.
3+
#
4+
# Location of the SDK. This is only used by Gradle.
5+
# For customization when using a Version Control System, please read the
6+
# header note.
7+
#Wed Jan 30 11:37:18 IST 2019
8+
sdk.dir=/Users/yogevbd/android-sdk-macosx
File renamed without changes.

android/app/react-native-notifications.iml

+242
Large diffs are not rendered by default.

android/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java renamed to android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import android.content.Context;
77
import android.content.Intent;
88
import android.content.pm.ApplicationInfo;
9+
import android.content.pm.PackageManager;
10+
import android.content.res.Resources;
911
import android.os.Bundle;
1012

1113
import com.facebook.react.bridge.ReactContext;
@@ -54,6 +56,8 @@ public class PushNotificationTest {
5456
@Mock private AppLifecycleFacade mAppLifecycleFacade;
5557
@Mock private AppLaunchHelper mAppLaunchHelper;
5658
@Mock private JsIOHelper mJsIOHelper;
59+
@Mock private Resources mResources;
60+
@Mock private PackageManager mPackageManager;
5761

5862
@Before
5963
public void setup() throws Exception {
@@ -68,7 +72,8 @@ public void setup() throws Exception {
6872

6973
ApplicationInfo ai = mock(ApplicationInfo.class);
7074
when(mContext.getApplicationInfo()).thenReturn(ai);
71-
75+
when(mContext.getResources()).thenReturn(mResources);
76+
when(mContext.getPackageManager()).thenReturn(mPackageManager);
7277
when(mContext.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(mNotificationManager);
7378
}
7479

android/build.gradle

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
apply plugin: 'com.android.library'
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

3-
android {
4-
compileSdkVersion 27
5-
buildToolsVersion '28.0.0'
6-
7-
defaultConfig {
8-
minSdkVersion 19
9-
targetSdkVersion 27
10-
versionCode 1
11-
versionName "1.0"
3+
buildscript {
4+
repositories {
5+
mavenLocal()
6+
mavenCentral()
7+
google()
8+
jcenter()
129
}
13-
buildTypes {
14-
release {
15-
minifyEnabled false
16-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
17-
}
10+
dependencies {
11+
classpath 'com.android.tools.build:gradle:3.0.1'
12+
classpath 'com.google.gms:google-services:4.0.0'
13+
// NOTE: Do not place your application dependencies here; they belong
14+
// in the individual module build.gradle files
1815
}
1916
}
2017

21-
22-
dependencies {
23-
implementation "com.google.firebase:firebase-messaging:17.3.0"
24-
implementation 'com.facebook.react:react-native:+'
25-
26-
testImplementation 'junit:junit:4.12'
27-
testImplementation 'org.mockito:mockito-core:2.+'
28-
testImplementation 'org.robolectric:robolectric:3.1.4'
18+
allprojects {
19+
repositories {
20+
mavenLocal()
21+
mavenCentral()
22+
google()
23+
jcenter()
24+
maven {
25+
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
26+
url "$rootDir/../node_modules/react-native/android"
27+
}
28+
}
2929
}

android/gradle.properties

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Gradle settings configured through the IDE *will override*
5+
# any settings specified in this file.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true
52.4 KB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Thu Jan 04 11:01:32 EET 2018
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

android/gradlew

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
#!/usr/bin/env bash
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10+
DEFAULT_JVM_OPTS=""
11+
12+
APP_NAME="Gradle"
13+
APP_BASE_NAME=`basename "$0"`
14+
15+
# Use the maximum available, or set MAX_FD != -1 to use that value.
16+
MAX_FD="maximum"
17+
18+
warn ( ) {
19+
echo "$*"
20+
}
21+
22+
die ( ) {
23+
echo
24+
echo "$*"
25+
echo
26+
exit 1
27+
}
28+
29+
# OS specific support (must be 'true' or 'false').
30+
cygwin=false
31+
msys=false
32+
darwin=false
33+
case "`uname`" in
34+
CYGWIN* )
35+
cygwin=true
36+
;;
37+
Darwin* )
38+
darwin=true
39+
;;
40+
MINGW* )
41+
msys=true
42+
;;
43+
esac
44+
45+
# Attempt to set APP_HOME
46+
# Resolve links: $0 may be a link
47+
PRG="$0"
48+
# Need this for relative symlinks.
49+
while [ -h "$PRG" ] ; do
50+
ls=`ls -ld "$PRG"`
51+
link=`expr "$ls" : '.*-> \(.*\)$'`
52+
if expr "$link" : '/.*' > /dev/null; then
53+
PRG="$link"
54+
else
55+
PRG=`dirname "$PRG"`"/$link"
56+
fi
57+
done
58+
SAVED="`pwd`"
59+
cd "`dirname \"$PRG\"`/" >/dev/null
60+
APP_HOME="`pwd -P`"
61+
cd "$SAVED" >/dev/null
62+
63+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
64+
65+
# Determine the Java command to use to start the JVM.
66+
if [ -n "$JAVA_HOME" ] ; then
67+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
68+
# IBM's JDK on AIX uses strange locations for the executables
69+
JAVACMD="$JAVA_HOME/jre/sh/java"
70+
else
71+
JAVACMD="$JAVA_HOME/bin/java"
72+
fi
73+
if [ ! -x "$JAVACMD" ] ; then
74+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
75+
76+
Please set the JAVA_HOME variable in your environment to match the
77+
location of your Java installation."
78+
fi
79+
else
80+
JAVACMD="java"
81+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
82+
83+
Please set the JAVA_HOME variable in your environment to match the
84+
location of your Java installation."
85+
fi
86+
87+
# Increase the maximum file descriptors if we can.
88+
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
89+
MAX_FD_LIMIT=`ulimit -H -n`
90+
if [ $? -eq 0 ] ; then
91+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
92+
MAX_FD="$MAX_FD_LIMIT"
93+
fi
94+
ulimit -n $MAX_FD
95+
if [ $? -ne 0 ] ; then
96+
warn "Could not set maximum file descriptor limit: $MAX_FD"
97+
fi
98+
else
99+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
100+
fi
101+
fi
102+
103+
# For Darwin, add options to specify how the application appears in the dock
104+
if $darwin; then
105+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106+
fi
107+
108+
# For Cygwin, switch paths to Windows format before running java
109+
if $cygwin ; then
110+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
113+
114+
# We build the pattern for arguments to be converted via cygpath
115+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
116+
SEP=""
117+
for dir in $ROOTDIRSRAW ; do
118+
ROOTDIRS="$ROOTDIRS$SEP$dir"
119+
SEP="|"
120+
done
121+
OURCYGPATTERN="(^($ROOTDIRS))"
122+
# Add a user-defined pattern to the cygpath arguments
123+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
124+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
125+
fi
126+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
127+
i=0
128+
for arg in "$@" ; do
129+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
130+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
131+
132+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
133+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
134+
else
135+
eval `echo args$i`="\"$arg\""
136+
fi
137+
i=$((i+1))
138+
done
139+
case $i in
140+
(0) set -- ;;
141+
(1) set -- "$args0" ;;
142+
(2) set -- "$args0" "$args1" ;;
143+
(3) set -- "$args0" "$args1" "$args2" ;;
144+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150+
esac
151+
fi
152+
153+
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154+
function splitJvmOpts() {
155+
JVM_OPTS=("$@")
156+
}
157+
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158+
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
159+
160+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 commit comments

Comments
 (0)