From 7c6277c8b8d3f19636be43e280d7ba9548c11c2f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Mon, 29 Aug 2022 19:05:40 +0200
Subject: [PATCH] [apex] Update tests (ApexUnitTestClassShouldHaveAsserts,
 ApexAssertionsShouldIncludeMessage) #4097

---
 .../ApexAssertionsShouldIncludeMessage.xml    | 68 +++++++++++++++++++
 .../ApexUnitTestClassShouldHaveAsserts.xml    |  4 +-
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexAssertionsShouldIncludeMessage.xml b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexAssertionsShouldIncludeMessage.xml
index f05e9124dab..7a499d556aa 100644
--- a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexAssertionsShouldIncludeMessage.xml
+++ b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexAssertionsShouldIncludeMessage.xml
@@ -116,4 +116,72 @@ public class Foo {
 }
         ]]></code>
    </test-code>
+
+    <test-code>
+        <description>[apex] Support new Assert class (Apex v56.0) - negative test case #4097</description>
+        <expected-problems>9</expected-problems>
+        <expected-linenumbers>6,12,19,28,34,40,46,52,58</expected-linenumbers>
+        <code><![CDATA[
+@isTest
+public class Foo {
+    @isTest
+    static void testAreEqual() {
+        String sub = 'abcde'.substring(2);
+        Assert.areEqual('cde', sub);
+   }
+
+    @isTest
+    static void testAreNotEqual() {
+        String sub = 'abcde'.substring(2);
+        Assert.areNotEqual('xyz', sub);
+   }
+
+    @isTest
+    static void testFail() {
+        try {
+            SomeClass.methodUnderTest();
+            Assert.fail();
+        } catch (DmlException ex) {
+            // Add assertions here about the expected exception
+        }
+   }
+
+    @isTest
+    static void testIsFalse() {
+        Boolean containsCode = 'Salesforce'.contains('code');
+        Assert.isFalse(containsCode);
+   }
+
+    @isTest
+    static void testIsInstanceOf() {
+        Account o = new Account();
+        Assert.isInstanceOfType(o, Account.class);
+   }
+
+    @isTest
+    static void testIsNotInstanceOf() {
+        Contact con = new Contact();
+        Assert.isNotInstanceOfType(con, Account.class);
+   }
+
+    @isTest
+    static void testIsNotNull() {
+        String myString = 'value';
+        Assert.isNotNull(myString);
+   }
+
+    @isTest
+    static void testIsNull() {
+        String myString = null;
+        Assert.isNull(myString);
+   }
+
+    @isTest
+    static void testIsTrue() {
+        Boolean containsForce = 'Salesforce'.contains('force');
+        Assert.isTrue(containsForce);
+   }
+}
+        ]]></code>
+    </test-code>
 </test-data>
diff --git a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexUnitTestClassShouldHaveAsserts.xml b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexUnitTestClassShouldHaveAsserts.xml
index 28ba29690b3..686ffd3cb65 100644
--- a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexUnitTestClassShouldHaveAsserts.xml
+++ b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/bestpractices/xml/ApexUnitTestClassShouldHaveAsserts.xml
@@ -76,13 +76,13 @@ private class C2_Assignment_Report_Job_Test {
 
     <test-code>
         <description>#1089 [apex] ApexUnitTestClassShouldHaveAsserts: Verify use of additionalAssertMethodPattern, positive test</description>
-        <rule-property name="additionalAssertMethodPattern">(Assert\.\w+|verify\w+)</rule-property>
+        <rule-property name="additionalAssertMethodPattern">(MyAssert\.\w+|verify\w+)</rule-property>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 @isTest
 public class Foo {
    public static testMethod void testAssertIsTrue() {
-      Assert.isTrue(someCondition);
+      MyAssert.isTrue(someCondition);
    }
 
    public static testMethod void testLocalVerify() {