Migrated to v53

rsoesemann · Nov 16, 2021 · 544f2e7 · 544f2e7
1 parent f66af2a
commit 544f2e7
Show file tree

Hide file tree

Showing 29 changed files with 282 additions and 220 deletions.
diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json
@@ -1,13 +1,5 @@
 {
   "orgName": "salesforce-plantuml_DEV",
   "edition": "Developer",
-  "features": [],
-  "settings": {
-    "lightningExperienceSettings": {
-      "enableS1DesktopEnabled": true
-    },
-    "mobileSettings": {
-      "enableS1EncryptedStoragePref2": false
-    }
-  }
+  "features": []
 }
diff --git a/force-app/main/default/applications/PlantUML.app-meta.xml b/force-app/main/default/applications/PlantUML.app-meta.xml
@@ -2,8 +2,6 @@
 <CustomApplication xmlns="http://soap.sforce.com/2006/04/metadata">
     <brand>
         <headerColor>#0070D2</headerColor>
-        <logo>plantuml1</logo>
-        <logoVersion>1</logoVersion>
         <shouldOverrideOrgTheme>false</shouldOverrideOrgTheme>
     </brand>
     <description>Renders UML diagrams for Apex Classes and SObjects</description>
@@ -15,5 +13,4 @@
     <tabs>ClassDiagramCreator</tabs>
     <tabs>ErdCreator</tabs>
     <uiType>Lightning</uiType>
-    <utilityBar>PlantUML_UtilityBar</utilityBar>
 </CustomApplication>
diff --git a/force-app/main/default/classes/ApexParser.cls-meta.xml b/force-app/main/default/classes/ApexParser.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>27.0</apiVersion>
+    <apiVersion>53.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/ClassDiagramCreatorCtrl.cls b/force-app/main/default/classes/ClassDiagramCreatorCtrl.cls
@@ -61,58 +61,4 @@ public with sharing class ClassDiagramCreatorCtrl {
          }
          return null;
     }
-
-
-    // TEST METHODS
-
-
-    static testmethod void testUIIsPopulatedOnConstructor() {
-        // Setup
-        Boolean noExceptionWasThrown = true;
-
-        // Execute
-        Test.setCurrentPageReference(Page.classDiagramCreator);
-        try {
-            ClassDiagramCreatorCtrl ctrl = new ClassDiagramCreatorCtrl();
-        }
-        catch(Exception ignored) {
-            noExceptionWasThrown = false;               
-        }
-
-        // Verify not much more than that no Exception was thrown
-        System.assert(noExceptionWasThrown);
-    }
-
-    static testmethod void errorShownOnCreateWithNoSelectedClass() {
-        // Setup 
-        Test.setCurrentPageReference(Page.classDiagramCreator);
-        ClassDiagramCreatorCtrl pageCtrl = new ClassDiagramCreatorCtrl();
-
-        // Execute
-        pageCtrl.doCreateDiagram();
-
-        // Verify
-        System.assert(ApexPages.hasMessages());
-    }
-
-    static testmethod void noErrorOnCreateWithSelectedClass() { 
-        // Setup 
-        Test.setCurrentPageReference(Page.classDiagramCreator);
-        ClassDiagramCreatorCtrl pageCtrl = new ClassDiagramCreatorCtrl();
-
-        // Execute
-        Boolean hasClasses = pageCtrl.accessibleClasses.size() > 0;
-        if(hasClasses) {
-            SelectOption anObject = pageCtrl.accessibleClasses.get(0);
-            pageCtrl.selectedClasses.add(anObject);
-            pageCtrl.classDiagram.showPublicMethods = true;
-            pageCtrl.classDiagram.showPublicVariables = true;
-            pageCtrl.classDiagram.showMetrics = true;
-        }
-        pageCtrl.doCreateDiagram();
-
-        // Verify
-        System.assert(!hasClasses || !ApexPages.hasMessages());
-        System.assert(!hasClasses || pageCtrl.classDiagram.plantUMLText != '');
-    }
 }
diff --git a/force-app/main/default/classes/ClassDiagramCreatorCtrl.cls-meta.xml b/force-app/main/default/classes/ClassDiagramCreatorCtrl.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>25.0</apiVersion>
+    <apiVersion>53.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/ClassDiagramCreatorCtrl_Test.cls b/force-app/main/default/classes/ClassDiagramCreatorCtrl_Test.cls
@@ -0,0 +1,68 @@
+@IsTest
+private class ClassDiagramCreatorCtrl_Test {
+
+    @IsTest
+    private static void testUIIsPopulatedOnConstructor() {
+
+        // Setup
+        Boolean noExceptionWasThrown = true;
+
+
+        // Execute
+        Test.setCurrentPageReference(Page.classDiagramCreator);
+        try {
+            new ClassDiagramCreatorCtrl();
+        }
+        catch(Exception ignored) {
+            noExceptionWasThrown = false;               
+        }
+
+
+        // Verify 
+        System.assert(noExceptionWasThrown);
+    }
+
+
+    @IsTest
+    private static void errorShownOnCreateWithNoSelectedClass() {
+
+        // Setup 
+        Test.setCurrentPageReference(Page.classDiagramCreator);
+        ClassDiagramCreatorCtrl pageCtrl = new ClassDiagramCreatorCtrl();
+
+
+        // Execute
+        pageCtrl.doCreateDiagram();
+
+
+        // Verify
+        System.assert(ApexPages.hasMessages());
+    }
+
+
+    @IsTest
+    private static void noErrorOnCreateWithSelectedClass() { 
+
+        // Setup 
+        Test.setCurrentPageReference(Page.classDiagramCreator);
+        ClassDiagramCreatorCtrl pageCtrl = new ClassDiagramCreatorCtrl();
+
+
+        // Execute
+        Boolean hasClasses = pageCtrl.accessibleClasses.size() > 0;
+        if(hasClasses) {
+            SelectOption anObject = pageCtrl.accessibleClasses.get(0);
+            pageCtrl.selectedClasses.add(anObject);
+            pageCtrl.classDiagram.showPublicMethods = true;
+            pageCtrl.classDiagram.showPublicVariables = true;
+            pageCtrl.classDiagram.showMetrics = true;
+        }
+
+        pageCtrl.doCreateDiagram();
+
+
+        // Verify
+        System.assert(!hasClasses || !ApexPages.hasMessages());
+        System.assert(!hasClasses || pageCtrl.classDiagram.plantUMLText != '');
+    }
+}
diff --git a/force-app/main/default/classes/ClassDiagramCreatorCtrl_Test.cls-meta.xml b/force-app/main/default/classes/ClassDiagramCreatorCtrl_Test.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>53.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/CodeMetric_Test.cls b/force-app/main/default/classes/CodeMetric_Test.cls
@@ -0,0 +1,36 @@
+@IsTest
+private class CodeMetric_Test {
+
+    @IsTest
+    private static void calculateMethodCCCorrectly() {
+
+        // Setup
+        ApexClass original = [SELECT Name, Body FROM ApexClass WHERE Name = 'ApexClassForTests'];
+
+
+        // Execute && Verify
+        ApexParser parser = new ApexParser();
+        for(ApexParser.ClassMember method : parser.parse(original).members) {
+            if(method.Name == 'complexityOf7') {
+                System.assertEquals(7, CodeMetrics.CC(method));
+            }
+        }
+    }
+
+
+    @IsTest
+    private static void calculateMethodCCIgnoresCommentsAndLiterals() {
+
+        // Setup
+        ApexClass original = [SELECT Name, Body FROM ApexClass WHERE Name = 'ApexClassForTests'];
+
+
+        // Execute + Verify
+        ApexParser parser = new ApexParser();
+        for(ApexParser.ClassMember method :  parser.parse(original).members) {
+            if(method.Name == 'ccCalculationIgnoresCommentsAndLiterals') {
+                System.assertEquals(1, CodeMetrics.CC(method));
+            }
+        }
+    }
+}
diff --git a/force-app/main/default/classes/CodeMetric_Test.cls-meta.xml b/force-app/main/default/classes/CodeMetric_Test.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>52.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/CodeMetrics.cls b/force-app/main/default/classes/CodeMetrics.cls
@@ -30,35 +30,4 @@ public class CodeMetrics {
 
         return methodCC;
     }
-
-
-    // TEST METHODS
-
-
-    static testMethod void calculateMethodCCCorrectly() {
-        // Setup
-        ApexClass original = [SELECT Name, Body FROM ApexClass WHERE Name = 'ApexClassForTests'];
-
-        // Execute && Verify
-        ApexParser parser = new ApexParser();
-        for(ApexParser.ClassMember method : parser.parse(original).members) {
-            if(method.Name == 'complexityOf7') {
-                System.assertEquals(7, CodeMetrics.CC(method));
-            }
-        }
-    }
-
-
-    static testMethod void calculateMethodCCIgnoresCommentsAndLiterals() {
-        // Setup
-        ApexClass original = [SELECT Name, Body FROM ApexClass WHERE Name = 'ApexClassForTests'];
-
-        // Execute && Verify
-        ApexParser parser = new ApexParser();
-        for(ApexParser.ClassMember method :  parser.parse(original).members) {
-            if(method.Name == 'ccCalculationIgnoresCommentsAndLiterals') {
-                System.assertEquals(1, CodeMetrics.CC(method));
-            }
-        }
-    }
 }
diff --git a/force-app/main/default/classes/CodeMetrics.cls-meta.xml b/force-app/main/default/classes/CodeMetrics.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>27.0</apiVersion>
+    <apiVersion>53.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/ERDCreatorCtrl.cls b/force-app/main/default/classes/ERDCreatorCtrl.cls
@@ -88,50 +88,4 @@ public with sharing class ERDCreatorCtrl {
                && !name.endsWith('Tag') 
                && !name.endsWith('Share') ;   
     }
-
-
-    // TEST METHODS
-
-    static testmethod void testUIIsPopulatedOnConstructor() {
-        // Setup
-        Test.setCurrentPageReference(Page.erdCreator);
-
-        // Execute
-        ERDCreatorCtrl ctrl = new ERDCreatorCtrl();
-
-        // Verify
-        System.assertNotEquals(0, ctrl.accessibleSObjects.size());
-        System.assertNotEquals(null, ctrl.getPermSets());
-        System.assertNotEquals(0, ctrl.getProfiles().size());
-        System.assertEquals(null, ctrl.erDiagram.permSet);
-        System.assertEquals('System Administrator', ctrl.erDiagram.profile);
-        System.assertEquals(0, ctrl.selectedSObjects.size());
-    }
-
-
-    static testmethod void errorShownOnCreateWithNoSelectedObject() {
-        // Setup 
-        Test.setCurrentPageReference(Page.erdCreator);
-        ERDCreatorCtrl pageCtrl = new ERDCreatorCtrl();
-
-        // Execute
-        pageCtrl.doCreateDiagram();
-
-        // Verify
-        System.assert(ApexPages.hasMessages());
-    }
-
-
-    static testmethod void noErrorOnCreateWithSelectedObject() {
-        // Setup 
-        Test.setCurrentPageReference(Page.erdCreator);
-        ERDCreatorCtrl pageCtrl = new ERDCreatorCtrl();
-
-        // Execute
-        pageCtrl.selectedSObjects.add(pageCtrl.accessibleSObjects.get(0));
-        pageCtrl.doCreateDiagram();
-
-        // Verify
-        System.assert(!ApexPages.hasMessages());
-    }
 }
diff --git a/force-app/main/default/classes/ERDCreatorCtrl.cls-meta.xml b/force-app/main/default/classes/ERDCreatorCtrl.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>25.0</apiVersion>
+    <apiVersion>53.0</apiVersion>
     <status>Active</status>
 </ApexClass>