Fixes #6086: Add transparent image detection and math tag validation #6144
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,15 @@ | ||
| """ | ||
| Tests corresponding to asset transformation scripts. | ||
| """ | ||
|
|
||
| load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") | ||
|
|
||
| kt_jvm_test( | ||
| name = "ImageRepairerTest", | ||
| srcs = ["ImageRepairerTest.kt"], | ||
| deps = [ | ||
| "//scripts/src/java/org/oppia/android/scripts/assets:image_repairer", | ||
| "//third_party:com_google_truth_truth", | ||
| "//third_party:org_jetbrains_kotlin_kotlin-test-junit", | ||
| ], | ||
| ) |
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,95 @@ | ||
| package org.oppia.android.scripts.assets | ||
|
|
||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.Test | ||
| import java.awt.Color | ||
| import java.awt.image.BufferedImage | ||
| import java.io.ByteArrayOutputStream | ||
| import javax.imageio.ImageIO | ||
|
|
||
| // Function name: test names are conventionally named with underscores. | ||
| @Suppress("FunctionName") | ||
| class ImageRepairerTest { | ||
| private val imageRepairer = ImageRepairer() | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_opaqueImage_returnsFalse() { | ||
| val imageData = createPngImageData(BufferedImage.TYPE_INT_ARGB) { graphics -> | ||
| graphics.color = Color(255, 0, 0, 255) | ||
| graphics.fillRect(0, 0, 2, 2) | ||
| } | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "png")).isFalse() | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_fullyTransparentImage_returnsTrue() { | ||
| val imageData = createPngImageData(BufferedImage.TYPE_INT_ARGB) { graphics -> | ||
| graphics.color = Color(0, 0, 0, 0) | ||
| graphics.fillRect(0, 0, 2, 2) | ||
| } | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "png")).isTrue() | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_partiallyTransparentPixel_returnsTrue() { | ||
| val imageData = createPngImageData(BufferedImage.TYPE_INT_ARGB) { graphics -> | ||
| graphics.color = Color(255, 0, 0, 128) | ||
| graphics.fillRect(0, 0, 2, 2) | ||
| } | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "png")).isTrue() | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_imageWithoutAlphaChannel_returnsFalse() { | ||
| val imageData = createPngImageData(BufferedImage.TYPE_INT_RGB) { graphics -> | ||
| graphics.color = Color.RED | ||
| graphics.fillRect(0, 0, 2, 2) | ||
| } | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "png")).isFalse() | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_svgExtension_returnsFalse() { | ||
| val imageData = "<svg></svg>".toByteArray() | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "svg")).isFalse() | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_svgExtensionUpperCase_returnsFalse() { | ||
| val imageData = "<svg></svg>".toByteArray() | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "SVG")).isFalse() | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasTransparentPixels_mixedOpaqueAndTransparent_returnsTrue() { | ||
| val image = BufferedImage(2, 2, BufferedImage.TYPE_INT_ARGB) | ||
| image.setRGB(0, 0, Color(255, 0, 0, 255).rgb) | ||
| image.setRGB(1, 0, Color(0, 255, 0, 255).rgb) | ||
| image.setRGB(0, 1, Color(0, 0, 255, 100).rgb) | ||
| image.setRGB(1, 1, Color(255, 255, 0, 255).rgb) | ||
| val imageData = ByteArrayOutputStream().also { | ||
| ImageIO.write(image, "png", it) | ||
| }.toByteArray() | ||
|
|
||
| assertThat(imageRepairer.hasTransparentPixels(imageData, "png")).isTrue() | ||
| } | ||
|
|
||
| private fun createPngImageData( | ||
| imageType: Int, | ||
| draw: (java.awt.Graphics2D) -> Unit | ||
| ): ByteArray { | ||
| val image = BufferedImage(2, 2, imageType) | ||
| val graphics = image.createGraphics() | ||
| draw(graphics) | ||
| graphics.dispose() | ||
| return ByteArrayOutputStream().also { | ||
| ImageIO.write(image, "png", it) | ||
| }.toByteArray() | ||
| } | ||
| } |
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,16 @@ | ||
| """ | ||
| Tests corresponding to structure compatibility checking scripts. | ||
| """ | ||
|
|
||
| load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") | ||
|
|
||
| kt_jvm_test( | ||
| name = "StructureCompatibilityCheckerTest", | ||
| srcs = ["StructureCompatibilityCheckerTest.kt"], | ||
| deps = [ | ||
| "//scripts/src/java/org/oppia/android/scripts/gae/compat", | ||
| "//scripts/src/java/org/oppia/android/scripts/gae/proto:localization_tracker", | ||
| "//third_party:com_google_truth_truth", | ||
| "//third_party:org_jetbrains_kotlin_kotlin-test-junit", | ||
| ], | ||
| ) |
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,85 @@ | ||
| package org.oppia.android.scripts.gae.compat | ||
|
|
||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.Test | ||
| import org.oppia.android.scripts.gae.compat.StructureCompatibilityChecker.Companion.checkMathTagsForLatex | ||
| import org.oppia.android.scripts.gae.compat.StructureCompatibilityChecker.CompatibilityFailure.MathTagMissingRawLatex | ||
| import org.oppia.android.scripts.gae.proto.LocalizationTracker.ContainerId | ||
|
|
||
| // Function name: test names are conventionally named with underscores. | ||
| @Suppress("FunctionName") | ||
| class StructureCompatibilityCheckerTest { | ||
| private val testOrigin: ContainerId = ContainerId.Exploration("test_exp_id") | ||
| private val testContentId = "test_content_id" | ||
|
|
||
| @Test | ||
| fun testCheckMathTagsForLatex_htmlWithNoMathTags_returnsNoFailures() { | ||
| val html = "<p>Simple text with no math.</p>" | ||
|
|
||
| val failures = checkMathTagsForLatex(html, testOrigin, testContentId) | ||
|
|
||
| assertThat(failures).isEmpty() | ||
| } | ||
|
|
||
| @Test | ||
| fun testCheckMathTagsForLatex_validMathTagWithRawLatex_returnsNoFailures() { | ||
| val html = buildMathTagHtml(rawLatex = "\\frac{1}{2}") | ||
|
|
||
| val failures = checkMathTagsForLatex(html, testOrigin, testContentId) | ||
|
|
||
| assertThat(failures).isEmpty() | ||
| } | ||
|
|
||
| @Test | ||
| fun testCheckMathTagsForLatex_mathTagWithEmptyRawLatex_returnsMissingRawLatexFailure() { | ||
| val html = buildMathTagHtml(rawLatex = "") | ||
|
|
||
| val failures = checkMathTagsForLatex(html, testOrigin, testContentId) | ||
|
|
||
| assertThat(failures).hasSize(1) | ||
| assertThat(failures.first()).isInstanceOf(MathTagMissingRawLatex::class.java) | ||
| assertThat((failures.first() as MathTagMissingRawLatex).contentId) | ||
| .isEqualTo(testContentId) | ||
| } | ||
|
|
||
| @Test | ||
| fun testCheckMathTagsForLatex_mathTagWithMissingContent_returnsMissingRawLatexFailure() { | ||
| val html = | ||
| "<oppia-noninteractive-math></oppia-noninteractive-math>" | ||
|
|
||
| val failures = checkMathTagsForLatex(html, testOrigin, testContentId) | ||
|
|
||
| assertThat(failures).hasSize(1) | ||
| assertThat(failures.first()).isInstanceOf(MathTagMissingRawLatex::class.java) | ||
| } | ||
|
|
||
| @Test | ||
| fun testCheckMathTagsForLatex_multipleMathTags_oneInvalid_returnsOneFailure() { | ||
| val validTag = buildMathTagHtml(rawLatex = "x^2") | ||
| val invalidTag = | ||
| "<oppia-noninteractive-math></oppia-noninteractive-math>" | ||
| val html = "$validTag $invalidTag" | ||
|
|
||
| val failures = checkMathTagsForLatex(html, testOrigin, testContentId) | ||
|
|
||
| assertThat(failures).hasSize(1) | ||
| assertThat(failures.first()).isInstanceOf(MathTagMissingRawLatex::class.java) | ||
| } | ||
|
|
||
| @Test | ||
| fun testCheckMathTagsForLatex_multipleMathTags_allValid_returnsNoFailures() { | ||
| val tag1 = buildMathTagHtml(rawLatex = "x^2") | ||
| val tag2 = buildMathTagHtml(rawLatex = "\\sqrt{2}") | ||
| val html = "$tag1 $tag2" | ||
|
|
||
| val failures = checkMathTagsForLatex(html, testOrigin, testContentId) | ||
|
|
||
| assertThat(failures).isEmpty() | ||
| } | ||
|
|
||
| private fun buildMathTagHtml(rawLatex: String): String { | ||
| val escapedContent = "{&quot;raw_latex&quot;:&quot;$rawLatex&quot;}" | ||
| return "<oppia-noninteractive-math math_content-with-value=\"$escapedContent\">" + | ||
| "</oppia-noninteractive-math>" | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.