Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert FallbackJSBundleLoaderTest to Kotlin #37750

Conversation

fabioh8010
Copy link
Contributor

Summary:

This PR converts FallbackJSBundleLoaderTest.java to Kotlin as requested in this issue.

Changelog:

[INTERNAL] [CHANGED] - Convert FallbackJSBundleLoaderTest to Kotlin

Test Plan:

  1. Run ./gradlew :packages:react-native:ReactAndroid:test.
  2. All tests should pass.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jun 7, 2023
@fabioh8010
Copy link
Contributor Author

@cortinico and @mdvacca could you please review? Thanks!

@analysis-bot
Copy link

Platform Engine Arch Size (bytes) Diff
android hermes arm64-v8a 8,744,421 -1
android hermes armeabi-v7a 8,056,627 +0
android hermes x86 9,235,548 +0
android hermes x86_64 9,086,380 -1
android jsc arm64-v8a 9,307,263 -1
android jsc armeabi-v7a 8,496,808 -2
android jsc x86 9,369,283 +0
android jsc x86_64 9,624,204 +1

Base commit: 08dc0a6
Branch: main

@facebook-github-bot
Copy link
Contributor

@rshest has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

1 similar comment
@facebook-github-bot
Copy link
Contributor

@rshest has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

Copy link
Contributor

@cortinico cortinico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sending this @fabioh8010

I've left some comments that needs to be addressed before we can merge this. Thanks for doing this work.

import org.mockito.Mockito.`when` as whenever

class FallbackJSBundleLoaderTest {
private lateinit var mLoggingDelegate: FakeLoggingDelegate
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private lateinit var mLoggingDelegate: FakeLoggingDelegate
private lateinit var loggingDelegate: FakeLoggingDelegate

Comment on lines 133 to 138
init {
val prefix = FallbackJSBundleLoader.RECOVERABLE
val first = prefix[0]

UNRECOVERABLE = prefix.replace(first, (first.code + 1).toChar())
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really not great and we should refactor it a bit.

Having tests rely on the init{} block of a companion object is really unpredictable.

Let's remove the companion object and let's move all the logic to private methods and initialize the stuff inside the setup method

assertThat(e).isInstanceOf(RuntimeException::class.java)

var cause = e.cause
val msgs = ArrayList<String?>()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
val msgs = ArrayList<String?>()
val msgs = mutableListOf<String>()

@fabioh8010
Copy link
Contributor Author

Hi @cortinico , I addressed the changes and also formatted the code with ktfmt, I realized that it wasn't enabled in the project (sorry about that).

@Pranav-yadav Pranav-yadav added the Tests This PR adds or edits a test case. label Jun 7, 2023
@facebook-github-bot
Copy link
Contributor

@rshest has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

Copy link
Contributor

@cortinico cortinico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@facebook-github-bot facebook-github-bot added the Merged This PR has been merged. label Jun 8, 2023
@facebook-github-bot
Copy link
Contributor

@rshest merged this pull request in e5dfe99.

adamaveray added a commit to adamaveray/react-native that referenced this pull request Jun 8, 2023
* main: (1824 commits)
  Convert FallbackJSBundleLoaderTest to Kotlin (facebook#37750)
  Migrate JSPackagerClientTest to Kotlin (facebook#37747)
  (refactor): kotlin-ify `ShareModuleTest.java` (facebook#37746)
  Upgrade `@react-native/codegen-typescript-test`'s Jest dependency to Jest 29 (facebook#37745)
  Move flow-typed definitions to repo root (facebook#37636)
  Convert InterpolatorTypeTest to Kotlin (facebook#37724)
  Update documentation of ReactHost.reload method (facebook#37691)
  Reduce visibility of ReactHost.destroy() method (facebook#37693)
  Reduce visibility in React Context (facebook#37695)
  Remove InstanceHandleHelper as unused (facebook#37740)
  Convert CompositeReactPackageTest to Kotlin (facebook#37734)
  Add license header to SetSpanOperation.java
  Convert FakeEventDispatcher to kotlin (facebook#37739)
  Convert FakeRCTEventEmitter to Kotlin (facebook#37733)
  Convert InteropModuleRegistryTest to Kotlin (facebook#37735)
  Bump `autorebase.yml` to `v1.8` (facebook#37584)
  Convert StackTraceHelperTest to Kotlin (facebook#37741)
  Convert BlobModuleTest class to Kotlin (facebook#37719)
  Update prettier to v2.8.8 (facebook#37738)
  Introduce BoltsFutureTask class to avoid leaking bolts.Task into ReactHost API (facebook#37744)
  ...

# Conflicts:
#	BUCK
#	packages/react-native/React/Views/UIResponder+FirstResponder.h
#	packages/react-native/React/Views/UIResponder+FirstResponder.m
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged This PR has been merged. Tests This PR adds or edits a test case.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants