@adobe/acc-js-sdk 1.0.9 → 1.1.2

package/test/client.test.js

@@ -2283,15 +2283,15 @@ describe('ACC Client', function () {
         it("Should ignore protocol for local storage root key", async () => {
             var connectionParameters = sdk.ConnectionParameters.ofUserAndPassword("http://acc-sdk:8080", "admin", "admin", {});
             var client = await sdk.init(connectionParameters);
-            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.0.9.acc-sdk:8080.cache.OptionCache$");
+            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.1.2.acc-sdk:8080.cache.OptionCache$");
 
             connectionParameters = sdk.ConnectionParameters.ofUserAndPassword("https://acc-sdk:8080", "admin", "admin", {});
             client = await sdk.init(connectionParameters);
-            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.0.9.acc-sdk:8080.cache.OptionCache$");
+            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.1.2.acc-sdk:8080.cache.OptionCache$");
 
             connectionParameters = sdk.ConnectionParameters.ofUserAndPassword("acc-sdk:8080", "admin", "admin", {});
             client = await sdk.init(connectionParameters);
-            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.0.9.acc-sdk:8080.cache.OptionCache$");
+            expect(client._optionCache._storage._rootKey).toBe("acc.js.sdk.1.1.2.acc-sdk:8080.cache.OptionCache$");
         })
 
         it("Should support no storage", async () => {
@@ -2422,4 +2422,56 @@ describe('ACC Client', function () {
             expect(paramsFn.mock.calls[0][1]).toMatchObject({ schemaId: "xtk:session", namespace: "xtkSession" });
         });
     });
+
+    describe("Method-level representation", () => {
+        it("Should force an xml representation", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_QUERY_EXECUTE_RESPONSE);
+            const queryDef = DomUtil.parse(`
+                <queryDef schema="nms:extAccount" operation="select">
+                    <select>
+                        <node expr="@id"/>
+                        <node expr="@name"/>
+                    </select>
+                </queryDef>
+            `);
+            const query = client.NLWS.xml.xtkQueryDef.create(queryDef);
+            const result = await query.executeQuery();
+            const xml = DomUtil.toXMLString(result);
+            expect(xml).toBe(`<extAccount-collection xmlns="urn:xtk:queryDef">
+            <extAccount id="1816" name="defaultPopAccount"/>
+            <extAccount id="1818" name="defaultOther"/>
+            <extAccount id="1849" name="billingReport"/>
+            <extAccount id="12070" name="TST_EXT_ACCOUNT_POSTGRESQL"/>
+            <extAccount id="1817" name="defaultEmailBulk"/>
+            <extAccount id="2087" name="ffda"/>
+            <extAccount id="2088" name="defaultEmailMid"/>
+        </extAccount-collection>`);
+        });
+
+        it("Should force an json representation", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_QUERY_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_QUERY_EXECUTE_RESPONSE);
+            const queryDef = {
+                "schema": "nms:extAccount",
+                "operation": "select",
+                "select": {
+                    "node": [
+                        { "expr": "@id" },
+                        { "expr": "@name" }
+                    ]
+                }
+            };
+            const query = client.NLWS.json.xtkQueryDef.create(queryDef);
+            const result = await query.executeQuery();
+            const json = JSON.stringify(result);
+            expect(json).toBe('{"#text":[],"extAccount":[{"id":"1816","name":"defaultPopAccount"},{"id":"1818","name":"defaultOther"},{"id":"1849","name":"billingReport"},{"id":"12070","name":"TST_EXT_ACCOUNT_POSTGRESQL"},{"id":"1817","name":"defaultEmailBulk"},{"id":"2087","name":"ffda"},{"id":"2088","name":"defaultEmailMid"}]}');
+        });
+    });
 });

package/test/soap.test.js

@@ -21,11 +21,12 @@ const { SoapMethodCall } = require('../src/soap.js');
 const { CampaignException, makeCampaignException } = require('../src/campaign.js');
 const { DomUtil } = require('../src/domUtil.js');
 const assert = require('assert');
+const sdk = require('../src/index.js');
 
 const URL = "https://soap-test/nl/jsp/soaprouter.jsp";
 
-function makeSoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString) {
-    const call = new SoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString);
+function makeSoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString, optionalCharset) {
+    const call = new SoapMethodCall(transport, urn, methodName, sessionToken, securityToken, userAgentString, optionalCharset);
     return call;
 }
 
@@ -682,6 +683,56 @@ describe('SOAP', function() {
             });
         })
     });
+
+    describe("Charset encoding", function() {
+
+        it("Should support no encoding", function() {
+            const call = makeSoapMethodCall(undefined, "xtk:session", "Empty");
+            const request = call._createHTTPRequest(URL);
+            assert.equal(request.url, URL);
+            assert.equal(request.headers["Content-type"], "application/soap+xml");
+        });
+
+        it("Should support UTF-8 encoding", function() {
+            const call = makeSoapMethodCall(undefined, "xtk:session", "Empty", undefined, undefined, undefined, "UTF-8");
+            const request = call._createHTTPRequest(URL);
+            assert.equal(request.url, URL);
+            assert.equal(request.headers["Content-type"], "application/soap+xml;charset=UTF-8");
+        });
+
+        it("Default encoding should be UTF-8", async () => {
+            const connectionParameters = sdk.ConnectionParameters.ofSessionToken("http://acc-sdk:8080", "mc/");
+            const client = await sdk.init(connectionParameters);
+            client._transport = jest.fn();
+            expect(client._connectionParameters._options.charset).toBe('UTF-8');
+            const soapCall = client._prepareSoapCall("xtk:persist", "GetEntityIfMoreRecent", true);
+            expect (soapCall._charset).toBe('UTF-8');
+            const request = soapCall._createHTTPRequest(URL);
+            assert.equal(request.headers["Content-type"], "application/soap+xml;charset=UTF-8");
+        })
+
+        it("Default support forcing an empty encoding", async () => {
+            const connectionParameters = sdk.ConnectionParameters.ofSessionToken("http://acc-sdk:8080", "mc/", { charset: "" });
+            const client = await sdk.init(connectionParameters);
+            client._transport = jest.fn();
+            expect(client._connectionParameters._options.charset).toBe('');
+            const soapCall = client._prepareSoapCall("xtk:persist", "GetEntityIfMoreRecent", true);
+            expect (soapCall._charset).toBe('');
+            const request = soapCall._createHTTPRequest(URL);
+            assert.equal(request.headers["Content-type"], "application/soap+xml");
+        })
+
+        it("Default support forcing an ISO charset", async () => {
+            const connectionParameters = sdk.ConnectionParameters.ofSessionToken("http://acc-sdk:8080", "mc/", { charset: "ISO-8859-1" });
+            const client = await sdk.init(connectionParameters);
+            client._transport = jest.fn();
+            expect(client._connectionParameters._options.charset).toBe('ISO-8859-1');
+            const soapCall = client._prepareSoapCall("xtk:persist", "GetEntityIfMoreRecent", true);
+            expect (soapCall._charset).toBe('ISO-8859-1');
+            const request = soapCall._createHTTPRequest(URL);
+            assert.equal(request.headers["Content-type"], "application/soap+xml;charset=ISO-8859-1");
+        })
+    });
     
 });
 

package/test/util.test.js

@@ -17,7 +17,7 @@ governing permissions and limitations under the License.
  * 
  *********************************************************************************/
 
- const { Util } = require('../src/util.js');
+ const { Util, ArrayMap } = require('../src/util.js');
  const { SafeStorage, Cache } = require('../src/cache.js');
 
 
@@ -232,4 +232,170 @@ describe('Util', function() {
         expect(cache._cache["Hello"].value).toBe("World");
     })
 
+    describe("ArrayMap", () => {
+
+        it("Should support access by keys", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            expect(am["hello"]).toBe("Hello");
+            expect(am["world"]).toBe("World");
+            expect(am.get("hello")).toBe("Hello");
+            expect(am.get("world")).toBe("World");
+        });
+
+        it("Should support access by index", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            expect(am[0]).toBe("Hello");
+            expect(am[1]).toBe("World");
+            expect(am.get(0)).toBe("Hello");
+            expect(am.get(1)).toBe("World");
+        });
+
+        it("Should support length attribute", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            expect(am.length).toBe(2);
+        });
+
+        it("Should support iterators (for...of)", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            let cat = "";
+            for (const s of am) cat = cat + s;
+            expect(cat).toBe("HelloWorld");
+        });
+
+        it("Should support map()", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            const cat = am.map(s => s).join(',');
+            expect(cat).toBe("Hello,World");
+        });
+
+        it("Should support flatMap()", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", ["Adobe", "World"]);
+            const cat = am.flatMap(s => s).join(',');
+            expect(cat).toBe("Hello,Adobe,World");
+        });
+
+        it("Should support find()", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            const world = am.find(s => s === 'World');
+            expect(world).toBe("World");
+            const notFound = am.find(s => s === 'NotFound');
+            expect(notFound).toBe(undefined);
+        });
+
+        it("Should support filter()", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            const all = am.filter(s => true);
+            expect(all).toMatchObject([ "Hello", "World" ]);
+            const none = am.filter(s => false);
+            expect(none).toMatchObject([ ]);
+            const world = am.filter(s => s === 'World');
+            expect(world).toMatchObject([ "World" ]);
+        });
+
+        it("Should support forEach", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            let cat = "";
+            am.forEach(s => cat = cat + s);
+            expect(cat).toBe("HelloWorld");
+        });
+
+        it("Should support forEach as a key", () => {
+            const am = new ArrayMap();
+            am._push("forEach", "Hello");
+            const cat = am.map(s => s).join(',');
+            expect(cat).toBe("Hello");
+            expect(typeof am.forEach).toBe('function');
+            expect(am["forEach"]).not.toBe("Hello"); // forEach is a function
+            expect(am.get("forEach")).toBe("Hello");
+        });
+
+        it("Should support for...in", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("world", "World");
+            let cat = "";
+            for (const s in am) cat = cat + s;
+            expect(cat).toBe("helloworld");
+        });
+
+        it("Should not support for...in when there's a property named 'forEach'", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("forEach", "World");
+            let cat = "";
+            for (const s in am) cat = cat + s;
+            expect(cat).toBe("hello");
+        });
+
+        it("Should support enumerations whose key is a number", () => {
+            // For instance the "addressQuality" enumeration
+            const am = new ArrayMap();
+            am._push("0", { name:"0", value:0 });
+            am._push("1", { name:"1", value:1 });
+            am._push("2", { name:"2", value:2 });
+            let cat = "";
+            for (const k in am) cat = cat + am.get(k).name;
+            expect(cat).toBe("012");
+        });
+
+        it("Should not support adding the same key twice", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            expect(() => { am._push("hello", "World"); }).toThrow("Failed to add element 'hello' to ArrayMap. There's already an item with the same name");
+        });
+
+        it("Should support missing names", () => {
+            const am = new ArrayMap();
+            am._push("", { name:"0", value:0 });
+            am._push(undefined, { name:"1", value:1 });
+            am._push(null, { name:"2", value:2 });
+            expect(am.length).toBe(3);
+            expect(am[0].name).toBe("0");
+            expect(am[1].name).toBe("1");
+            expect(am[2].name).toBe("2");
+        });
+
+        it("Should handle compatibility", () => {
+            const am = new ArrayMap();
+            am._push("perfect", { name:"perfect", value:0 });
+            am._push("notPerfect", { name:"notPerfect", value:1 });
+            am._push("error", { name:"error", value:2 });
+            // length
+            expect(am.length).toBe(3);
+            // Access by name
+            expect(am.perfect).toMatchObject({ name:"perfect", value:0 });
+            expect(am.notPerfect).toMatchObject({ name:"notPerfect", value:1 });
+            expect(am.error).toMatchObject({ name:"error", value:2 });
+            expect(am.notFound).toBeUndefined();
+            // for .. in loop
+            const list = [];
+            for (const p in am) list.push(p);
+            expect(list).toMatchObject([ "perfect", "notPerfect", "error" ]);
+        });
+    });
+
+    describe("Is Browser", () => {
+        it("Should not be a browser", () => {
+            expect(Util.isBrowser()).toBe(false);
+        });
+    });
 });
+