Merge pull request #174 from Unity-Technologies/minor-fixes

Minor fixes

Author: aurimasc

.yamato/upm-ci.yml

@@ -1,13 +1,7 @@
 test_editors:
   - version: trunk
   - version: 2022.1
-  - version: 2021.2
-  - version: 2020.3
-
-ios_test_editors:
-  - version: trunk
-  - version: 2022.1
-  - version: 2021.2
+  - version: 2021.3
   - version: 2020.3
 
 test_platforms:
@@ -19,17 +13,6 @@ test_platforms:
 artifactory:
   production: https://artifactory.prd.it.unity3d.com/artifactory/api/
 
-mobile_dependencies:
-  - unity_test_framework:
-    name: com.unity.test-framework.build
-    version: 0.0.1-preview.12
-  - performance_test_framework:
-    name: com.unity.test-framework.utp-reporter
-    version: 1.0.0-preview
-  - mobile_notifications:
-    name: com.unity.mobile.notifications
-    version: file:../../com.unity.mobile.notifications
-
 utr:
   url_win: https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat
   url_unix: https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr
@@ -85,22 +68,14 @@ test_Android_{{ editor.version }}:
     image: mobile/android-execution-r19:stable
     flavor: b1.medium
   commands:
-    - choco source add -n Unity -s {{ artifactory.production }}nuget/unity-choco-local
-    - choco install unity-config
-    - unity-config settings editor-path .Editor
-    - unity-config project create .MyTestProject
-{%- for dependency in mobile_dependencies -%}
-    - unity-config project add dependency {{dependency.name}}@{{dependency.version}} --project-path .MyTestProject
-{%- endfor -%}
-    - unity-config project add testable com.unity.mobile.notifications
     - curl -s {{ utr.url_win }} --output utr.bat
     - pip install unity-downloader-cli --index-url {{ artifactory.production }}pypi/pypi/simple --upgrade
     - unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --wait --fast
-    - utr.bat --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900  --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
+    - utr.bat --testproject=TestProjects\com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900  --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
     - |
        set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
        start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
-       utr.bat --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900 --player-load-path=build/players
+       utr.bat --testproject=TestProjects\com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900 --player-load-path=build/players
   after:
     - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
     - powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > upm-ci~/test-results/android/android_device_log.txt
@@ -112,7 +87,7 @@ test_Android_{{ editor.version }}:
     - .yamato/upm-ci.yml#pack
 {% endfor %}
 
-{% for editor in ios_test_editors %}
+{% for editor in test_editors %}
 test_iOS_{{ editor.version }}:
   name: Test {{ editor.version }} on iOS
   agent:
@@ -122,20 +97,12 @@ test_iOS_{{ editor.version }}:
   variables:
     IOS_SIMULATOR_SDK: 1
   commands:
-    - brew tap --force-auto-update unity/unity [email protected]:unity/homebrew-unity.git
-    - brew install unity-config
-    - unity-config settings editor-path .Editor
-    - unity-config project create .MyTestProject
-{%- for dependency in mobile_dependencies -%}
-    - unity-config project add dependency {{dependency.name}}@{{dependency.version}} --project-path .MyTestProject
-{%- endfor -%}
-    - unity-config project add testable com.unity.mobile.notifications
     - curl -s {{ utr.url_unix }} --output utr
     - chmod u+x utr
     - pip install unity-downloader-cli --index-url {{ artifactory.production }}pypi/pypi/simple --upgrade
     - unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --wait --fast
-    - ./utr --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
-    - ./utr --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --player-load-path=build/players
+    - ./utr --testproject=TestProjects/com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
+    - ./utr --testproject=TestProjects/com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --player-load-path=build/players
   artifacts:
     packages:
       paths:
@@ -170,8 +137,6 @@ test_trigger:
     - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }}
     {% endfor %}
     - .yamato/upm-ci.yml#test_Android_{{ editor.version }}
-    {% endfor %}
-    {% for editor in ios_test_editors %}
     - .yamato/upm-ci.yml#test_iOS_{{ editor.version }}
     {% endfor %}
 

com.unity.mobile.notifications/Editor/AndroidNotificationPostProcessor.cs

@@ -24,8 +24,8 @@ public void OnPostGenerateGradleAndroidProject(string projectPath)
 
         private void MinSdkCheck()
         {
-#if !UNITY_2020_2_OR_NEWER
-        // API level 21 not supported since 2020.2, need to check for prior releases
+#if !UNITY_2021_2_OR_NEWER
+        // API level 21 not supported since 2021.2, need to check for prior releases
         const AndroidSdkVersions kMinAndroidSdk = AndroidSdkVersions.AndroidApiLevel21;
 
         if (PlayerSettings.Android.minSdkVersion < AndroidSdkVersions.AndroidApiLevel21)

com.unity.mobile.notifications/Tests/Runtime/iOS/iOSNotificationTests.cs

@@ -74,6 +74,7 @@ public void AfterEachTest()
     {
         receivedNotificationCount = 0;
         lastReceivedNotification = null;
+        iOSNotificationCenter.RemoveAllScheduledNotifications();
     }
 #endif
 
@@ -158,7 +159,7 @@ public IEnumerator SendNotificationWithUserInfo_NotificationIsReceivedWithSameUs
     IEnumerator SendNotificationUsingCalendarTrigger_NotificationIsReceived(string text, bool useUtc)
     {
         var dateTime = useUtc ? DateTime.UtcNow : DateTime.Now;
-        var dt = dateTime.AddSeconds(3);
+        var dt = dateTime.AddSeconds(5);
         var trigger = new iOSNotificationCalendarTrigger()
         {
             Year = dt.Year,
@@ -180,6 +181,7 @@ IEnumerator SendNotificationUsingCalendarTrigger_NotificationIsReceived(string t
         };
 
         iOSNotificationCenter.ScheduleNotification(notification);
+        Debug.Log($"SendNotificationUsingCalendarTrigger_NotificationIsReceived, Now: {dateTime}, Notification should arrive on: {dt}");
         yield return WaitForNotification(10.0f);
         Assert.AreEqual(1, receivedNotificationCount);
         Assert.IsNotNull(lastReceivedNotification);