fix(android): show updates for lexical models #16266
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* | ||
| * Keyman is copyright (C) SIL Global. MIT License. | ||
| */ | ||
| package com.keyman.engine.data; | ||
|
|
||
| import android.content.Context; | ||
| import androidx.test.core.app.ApplicationProvider; | ||
| import org.junit.After; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.robolectric.RobolectricTestRunner; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.Method; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| @RunWith(RobolectricTestRunner.class) | ||
| public class CloudRepositoryTests { | ||
|
|
||
| private CloudRepository repository; | ||
| private Dataset dataset; | ||
| private Context context; | ||
|
|
||
| private boolean containsModel(Dataset.LexicalModels models, String modelID) { | ||
| for (int i = 0; i < models.getCount(); i++) { | ||
| if (models.getItem(i).getLexicalModelID().equals(modelID)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private void setMemCachedDataset(Dataset dataset) throws Exception { | ||
| Field field = CloudRepository.class.getDeclaredField("memCachedDataset"); | ||
| field.setAccessible(true); | ||
| field.set(repository, dataset); | ||
| } | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| context = ApplicationProvider.getApplicationContext(); | ||
| repository = CloudRepository.shared; | ||
| dataset = new Dataset(context); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() throws Exception { | ||
| // Reset singleton state | ||
| setMemCachedDataset(null); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMergeLexicalModels_PreservesUniqueExistingModels() throws Exception { | ||
| // Setup | ||
| dataset.lexicalModels.add(new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.0", "", "")); | ||
| List<LexicalModel> newModels = new ArrayList<>(); | ||
| newModels.add(new LexicalModel("pkg2", "model2", "Model 2", "fr", "French", "1.0", "", "")); | ||
|
|
||
| // Execute | ||
| Method mergeMethod = CloudRepository.class.getDeclaredMethod("mergeLexicalModels", Dataset.LexicalModels.class, List.class); | ||
| mergeMethod.setAccessible(true); | ||
| mergeMethod.invoke(repository, dataset.lexicalModels, newModels); | ||
|
|
||
| // Verify | ||
| Assert.assertEquals(2, dataset.lexicalModels.getCount()); | ||
| Assert.assertTrue(containsModel(dataset.lexicalModels, "model1")); | ||
| Assert.assertTrue(containsModel(dataset.lexicalModels, "model2")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMergeLexicalModels_UpdatesVersion() throws Exception { | ||
| // Setup | ||
| dataset.lexicalModels.add(new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.0", "", "")); | ||
|
|
||
| List<LexicalModel> newModels = new ArrayList<>(); | ||
| // New model (same ID, newer version v1.1) | ||
| newModels.add(new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.1", "", "")); | ||
|
|
||
| // Execute | ||
| Method mergeMethod = CloudRepository.class.getDeclaredMethod("mergeLexicalModels", Dataset.LexicalModels.class, List.class); | ||
| mergeMethod.setAccessible(true); | ||
| mergeMethod.invoke(repository, dataset.lexicalModels, newModels); | ||
|
|
||
| // Verify | ||
| Assert.assertEquals(1, dataset.lexicalModels.getCount()); | ||
| LexicalModel result = dataset.lexicalModels.getItem(0); | ||
| Assert.assertEquals("1.1", result.getVersion()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMergeLexicalModels_KeepsOlderIfNewerIsLowerVersion() throws Exception { | ||
| // Setup | ||
| dataset.lexicalModels.add(new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.2", "", "")); | ||
|
|
||
| List<LexicalModel> newModels = new ArrayList<>(); | ||
| // New model (same ID, older version v1.1) | ||
| newModels.add(new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.1", "", "")); | ||
|
|
||
| // Execute | ||
| Method mergeMethod = CloudRepository.class.getDeclaredMethod("mergeLexicalModels", Dataset.LexicalModels.class, List.class); | ||
| mergeMethod.setAccessible(true); | ||
| mergeMethod.invoke(repository, dataset.lexicalModels, newModels); | ||
|
|
||
| // Verify | ||
| Assert.assertEquals(1, dataset.lexicalModels.getCount()); | ||
| LexicalModel result = dataset.lexicalModels.getItem(0); | ||
| Assert.assertEquals("1.2", result.getVersion()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetAssociatedLexicalModel_ReturnsCorrectModel() throws Exception { | ||
| // Setup | ||
| LexicalModel model1 = new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.0", "", ""); | ||
| LexicalModel model2 = new LexicalModel("pkg2", "model2", "Model 2", "fr", "French", "1.0", "", ""); | ||
| dataset.lexicalModels.add(model1); | ||
| dataset.lexicalModels.add(model2); | ||
| setMemCachedDataset(dataset); | ||
|
|
||
| // Execute & Verify | ||
| Assert.assertEquals(model1, repository.getAssociatedLexicalModel(context, "en")); | ||
| Assert.assertEquals(model2, repository.getAssociatedLexicalModel(context, "fr")); | ||
| Assert.assertEquals(model1, repository.getAssociatedLexicalModel(context, "EN")); // Case insensitivity | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetAssociatedLexicalModel_ReturnsNullWhenDatasetIsNull() throws Exception { | ||
| // Setup | ||
| setMemCachedDataset(null); | ||
|
|
||
| // Execute & Verify | ||
| Assert.assertNull(repository.getAssociatedLexicalModel(context, "en")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetAssociatedLexicalModel_ReturnsFirstMatch() throws Exception { | ||
| // Setup | ||
| LexicalModel model1 = new LexicalModel("pkg1", "model1", "Model 1", "en", "English", "1.0", "", ""); | ||
| LexicalModel model2 = new LexicalModel("pkg2", "model2", "Model 2", "en", "English", "1.0", "", ""); | ||
| dataset.lexicalModels.add(model1); | ||
| dataset.lexicalModels.add(model2); | ||
| setMemCachedDataset(dataset); | ||
|
|
||
| // Execute & Verify | ||
| Assert.assertEquals(model1, repository.getAssociatedLexicalModel(context, "en")); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is necessary to get matching models. The way we did it before (
KeyboardPickerActivity.getLexicalModelIndex(aContext, lexicalModelID)) never found anything because the the second parameter is expected to be the full model key, consisting of pkg id, language id and model id, but we passed in only the model id.