Merge pull request #1204 from Privado-Inc/pawan/php-tests-migrate

PHP: Migrate older test suites to newer ones
Privado-Inc · Jul 4, 2024 · 9aa12c2 · 9aa12c2
2 parents b11ca79 + bfa0997
commit 9aa12c2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/src/test/scala/ai/privado/languageEngine/php/tagger/source/FieldIdentifierTaggingTests.scala b/src/test/scala/ai/privado/languageEngine/php/tagger/source/FieldIdentifierTaggingTests.scala
@@ -22,14 +22,14 @@
  */
 package ai.privado.languageEngine.php.tagger.source
 
-import ai.privado.languageEngine.php.PhpTestBase
 import ai.privado.model.*
+import ai.privado.testfixtures.PhpFrontendTestSuite
 import io.shiftleft.semanticcpg.language.*
 
-class FieldIdentifierTaggingTests extends PhpTestBase {
+class FieldIdentifierTaggingTests extends PhpFrontendTestSuite {
   "Field access in code" should {
-    "be tagged as part of identifier tagger" in {
-      val (cpg, _) = code("""
+    val cpg = code(
+      """
           |<?php
           |class Person {
           |  public $firstName;
@@ -44,8 +44,11 @@ class FieldIdentifierTaggingTests extends PhpTestBase {
           |  }
           |}
           |?>
-          |""".stripMargin)
+          |""".stripMargin,
+      "Test.php"
+    )
 
+    "be tagged as part of identifier tagger" in {
       val List(firstNameField) = cpg.fieldAccess.l
       firstNameField.code shouldBe "$this->firstName"
       firstNameField.tag.nameExact(Constants.catLevelOne).value.l shouldBe List(CatLevelOne.SOURCES.name)

diff --git a/src/test/scala/ai/privado/languageEngine/php/tagger/source/IdentifierTaggingTest.scala b/src/test/scala/ai/privado/languageEngine/php/tagger/source/IdentifierTaggingTest.scala
@@ -22,13 +22,14 @@
  */
 package ai.privado.languageEngine.php.tagger.source
 
-import ai.privado.languageEngine.php.PhpTestBase
 import ai.privado.model.*
+import ai.privado.testfixtures.PhpFrontendTestSuite
 import io.shiftleft.semanticcpg.language.*
 
-class IdentifierTaggingTest extends PhpTestBase {
+class IdentifierTaggingTest extends PhpFrontendTestSuite {
   "Tagging derived sources" should {
-    val (cpg, _) = code("""
+    val cpg = code(
+      """
         |<?php
         |
         |  class User {
@@ -51,7 +52,9 @@ class IdentifierTaggingTest extends PhpTestBase {
         |  echo $user->firstName;
         |?>
         |
-        |""".stripMargin)
+        |""".stripMargin,
+      "Test.php"
+    )
 
     "tag member in a structure" in {
       cpg.member("firstName").tag.nameExact(Constants.id).value.l shouldBe List("Data.Sensitive.FirstName")

diff --git a/src/test/scala/ai/privado/languageEngine/php/tagger/source/LiteralTaggingTests.scala b/src/test/scala/ai/privado/languageEngine/php/tagger/source/LiteralTaggingTests.scala
@@ -22,14 +22,19 @@
  */
 package ai.privado.languageEngine.php.tagger.source
 
-import ai.privado.languageEngine.php.PhpTestBase
+import ai.privado.cache.RuleCache
 import ai.privado.model.*
+import ai.privado.rule.RuleInfoTestData
+import ai.privado.testfixtures.PhpFrontendTestSuite
 import io.shiftleft.semanticcpg.language.*
 
-class LiteralTaggingTests extends PhpTestBase {
+class LiteralTaggingTests extends PhpFrontendTestSuite {
+  val configAndRules: ConfigAndRules = ConfigAndRules(sources = RuleInfoTestData.sourceRule)
+  val ruleCache: RuleCache           = new RuleCache().setRule(configAndRules)
+
   "Literals in code" should {
-    "be tagged as part of LiteralTagger" in {
-      val (cpg, _) = code("""
+    val cpg = code(
+      """
           |<?php
           |class Person {
           |  function initialize() {
@@ -40,8 +45,11 @@ class LiteralTaggingTests extends PhpTestBase {
           |  }
           |}
           |?>
-          |""".stripMargin)
+          |""".stripMargin,
+      "Test.php"
+    )
 
+    "be tagged as part of LiteralTagger" in {
       val literals = cpg.literal.l
       literals.last.code shouldBe "\"phone\""
       literals.last.tag.nameExact(Constants.catLevelOne).value.l shouldBe List(CatLevelOne.SOURCES.name)