From 72826c486fb9796df467e4467e0ff1f6f89e7855 Mon Sep 17 00:00:00 2001 From: "John M. Daniel" Date: Sat, 30 Nov 2024 13:13:42 -0500 Subject: [PATCH 1/3] fix: corrected name in scratch org def file --- config/project-scratch-def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/project-scratch-def.json b/config/project-scratch-def.json index 6c4f44fd..1cc3b7ad 100644 --- a/config/project-scratch-def.json +++ b/config/project-scratch-def.json @@ -1,5 +1,5 @@ { - "orgName": "apex-mock", + "orgName": "apex-mocks", "edition": "Developer", "settings": { "lightningExperienceSettings": { From 9cf40534f59905461cb8701051ee83618bd56635 Mon Sep 17 00:00:00 2001 From: "John M. Daniel" Date: Sat, 30 Nov 2024 13:14:03 -0500 Subject: [PATCH 2/3] removed need for obsolete `fflib_Mocks` class --- .../test/classes/fflib_ApexMocksTest.cls | 6 +- .../test/classes/mocks/fflib_Mocks.cls | 60 ------------------- .../classes/mocks/fflib_Mocks.cls-meta.xml | 5 -- 3 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls delete mode 100644 sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml diff --git a/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls b/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls index 22c827c5..ef45f049 100644 --- a/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls +++ b/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls @@ -720,7 +720,8 @@ private class fflib_ApexMocksTest { // Given fflib_ApexMocks mocks = new fflib_ApexMocks(); - fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks); + // fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks); + fflib_MyList mockList = (fflib_MyList)mocks.mock(fflib_MyList.class); // When mockList.add('bob'); @@ -735,7 +736,8 @@ private class fflib_ApexMocksTest { // Given fflib_ApexMocks mocks = new fflib_ApexMocks(); - fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks); + // fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks); + fflib_MyList mockList = (fflib_MyList)mocks.mock(fflib_MyList.class); // When mocks.startStubbing(); diff --git a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls b/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls deleted file mode 100644 index 20ed44f7..00000000 --- a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls +++ /dev/null @@ -1,60 +0,0 @@ -/* Generated by apex-mocks-generator version 4.0.1 */ -@isTest -public class fflib_Mocks -{ - public class Mockfflib_MyList implements fflib_MyList.IList - { - private fflib_ApexMocks mocks; - - public Mockfflib_MyList(fflib_ApexMocks mocks) - { - this.mocks = mocks; - } - - public void add(String value) - { - mocks.mockVoidMethod(this, 'add', new List {System.Type.forName('String')}, new List {value}); - } - - public void add(String value1, String value2, String value3, String value4) - { - mocks.mockVoidMethod(this, 'add', new List {System.Type.forName('String'), System.Type.forName('String'), System.Type.forName('String'), System.Type.forName('String')}, new List {value1, value2, value3, value4}); - } - - public void addMore(String value) - { - mocks.mockVoidMethod(this, 'addMore', new List {System.Type.forName('String')}, new List {value}); - } - - public void add(String[] value) - { - mocks.mockVoidMethod(this, 'add', new List {System.Type.forName('String[]')}, new List {value}); - } - - public String get(Integer index) - { - return (String) mocks.mockNonVoidMethod(this, 'get', new List {System.Type.forName('Integer')}, new List {index}); - } - - public String get2(Integer index, String value) - { - return (String) mocks.mockNonVoidMethod(this, 'get2', new List {System.Type.forName('Integer'), System.Type.forName('String')}, new List {index, value}); - } - - public void clear() - { - mocks.mockVoidMethod(this, 'clear', new List {}, new List {}); - } - - public Boolean isEmpty() - { - return (Boolean) mocks.mockNonVoidMethod(this, 'isEmpty', new List {}, new List {}); - } - - public void set(Integer index, Object value) - { - mocks.mockVoidMethod(this, 'set', new List {System.Type.forName('Integer'), System.Type.forName('Object')}, new List {index, value}); - } - } - -} diff --git a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml b/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml deleted file mode 100644 index 651b1729..00000000 --- a/sfdx-source/apex-mocks/test/classes/mocks/fflib_Mocks.cls-meta.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 61.0 - Active - From 615f40c685c571f33d0d5ce3d8452f837cec9178 Mon Sep 17 00:00:00 2001 From: "John M. Daniel" Date: Mon, 2 Dec 2024 11:11:24 -0500 Subject: [PATCH 3/3] removed obsolete comments --- sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls | 2 -- 1 file changed, 2 deletions(-) diff --git a/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls b/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls index ef45f049..a51cfcd6 100644 --- a/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls +++ b/sfdx-source/apex-mocks/test/classes/fflib_ApexMocksTest.cls @@ -720,7 +720,6 @@ private class fflib_ApexMocksTest { // Given fflib_ApexMocks mocks = new fflib_ApexMocks(); - // fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks); fflib_MyList mockList = (fflib_MyList)mocks.mock(fflib_MyList.class); // When @@ -736,7 +735,6 @@ private class fflib_ApexMocksTest { // Given fflib_ApexMocks mocks = new fflib_ApexMocks(); - // fflib_MyList.IList mockList = new fflib_Mocks.Mockfflib_MyList(mocks); fflib_MyList mockList = (fflib_MyList)mocks.mock(fflib_MyList.class); // When