From 07084b22f9e4bef34ecd11bdba5a59eb5d8c8da8 Mon Sep 17 00:00:00 2001 From: alandavis Date: Fri, 14 Jan 2022 09:09:34 +0000 Subject: [PATCH] Pick up T-Engines 2.5.5-A3 & T-Model 1.4.7 * More "Pangram, fox, dog, Gym class featuring" test fixes --- .../org/alfresco/rest/api/tests/SharedLinkApiTest.java | 6 +++--- .../alfresco/repo/action/ActionServiceImpl2Test.java | 2 +- .../action/executer/AsynchronousExtractorTest.java | 10 +++++----- .../metadata/AbstractMetadataExtracterTest.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java index 1d76564baf..54414730a5 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java @@ -204,7 +204,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertEquals(d1Id, resp.getNodeId()); assertEquals(fileName1, resp.getName()); assertEquals("The quick brown fox jumps over the lazy dog", resp.getTitle()); - assertEquals("Gym class featuring a brown fox and lazy dog", resp.getDescription()); + assertEquals("Pangram, fox, dog, Gym class featuring a brown fox and lazy dog", resp.getDescription()); assertEquals(file1_MimeType, resp.getContent().getMimeType()); assertEquals("Adobe PDF Document", resp.getContent().getMimeTypeName()); @@ -245,7 +245,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertEquals(shared1Id, resp.getId()); assertEquals(fileName1, resp.getName()); assertEquals("The quick brown fox jumps over the lazy dog", resp.getTitle()); - assertEquals("Gym class featuring a brown fox and lazy dog", resp.getDescription()); + assertEquals("Pangram, fox, dog, Gym class featuring a brown fox and lazy dog", resp.getDescription()); assertEquals(d1Id, resp.getNodeId()); assertNull(resp.getAllowableOperations()); // include is ignored assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored @@ -1319,7 +1319,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest // Quick check that some extended info is present. assertEquals("The quick brown fox jumps over the lazy dog", sharedLink.getTitle()); - assertEquals("Gym class featuring a brown fox and lazy dog", sharedLink.getDescription()); + assertEquals("Pangram, fox, dog, Gym class featuring a brown fox and lazy dog", sharedLink.getDescription()); }); } diff --git a/repository/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java b/repository/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java index df9a8cc1aa..56076b1c05 100644 --- a/repository/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java +++ b/repository/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java @@ -430,7 +430,7 @@ public class ActionServiceImpl2Test { public Void execute() throws Throwable { - assertEquals("Gym class featuring a brown fox and lazy dog", + assertEquals("Pangram, fox, dog, Gym class featuring a brown fox and lazy dog", nodeService.getProperty(testNode, ContentModel.PROP_DESCRIPTION)); return null; } diff --git a/repository/src/test/java/org/alfresco/repo/action/executer/AsynchronousExtractorTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/AsynchronousExtractorTest.java index 1f9db9647d..853645f3f9 100644 --- a/repository/src/test/java/org/alfresco/repo/action/executer/AsynchronousExtractorTest.java +++ b/repository/src/test/java/org/alfresco/repo/action/executer/AsynchronousExtractorTest.java @@ -514,7 +514,7 @@ public class AsynchronousExtractorTest extends BaseSpringTest public void testExtractHtml() throws Exception { expectedProperties.put(QName.createQName("cm:author", namespacePrefixResolver), "Nevin Nollop"); - expectedProperties.put(QName.createQName("cm:description", namespacePrefixResolver), "Gym class featuring a brown fox and lazy dog"); + expectedProperties.put(QName.createQName("cm:description", namespacePrefixResolver), "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog"); expectedProperties.put(QName.createQName("cm:title", namespacePrefixResolver), "The quick brown fox jumps over the lazy dog"); assertAsyncMetadataExecute(contentMetadataExtracter, "quick/quick.html_metadata.json", @@ -728,7 +728,7 @@ public class AsynchronousExtractorTest extends BaseSpringTest expectedProperties.put(author, "Original author"); expectedProperties.put(title, "The quick brown fox jumps over the lazy dog"); - expectedProperties.put(description, "Gym class featuring a brown fox and lazy dog"); + expectedProperties.put(description, "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog"); expectedProperties.put(audio, "Default audio"); assertAsyncMetadataExecute(contentMetadataExtracter, "quick/quick.prudent_policy_metadata.json", @@ -759,7 +759,7 @@ public class AsynchronousExtractorTest extends BaseSpringTest expectedProperties.put(author, "Original author"); expectedProperties.put(title, "The quick brown fox jumps over the lazy dog"); - expectedProperties.put(description, "Gym class featuring a brown fox and lazy dog"); + expectedProperties.put(description, "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog"); expectedProperties.put(audio, "New audio"); assertAsyncMetadataExecute(contentMetadataExtracter, "quick/quick.pragmatic_policy_metadata.json", @@ -783,7 +783,7 @@ public class AsynchronousExtractorTest extends BaseSpringTest origProperties.put(title, "Default title"); expectedProperties.put(author, "Nevin Nollop"); - expectedProperties.put(description, "Gym class featuring a brown fox and lazy dog"); + expectedProperties.put(description, "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog"); assertAsyncMetadataExecute(contentMetadataExtracter, "quick/quick.carryAspectFalse_metadata.json", UNCHANGED_HASHCODE, origSize, expectedProperties, OverwritePolicy.PRAGMATIC); @@ -814,7 +814,7 @@ public class AsynchronousExtractorTest extends BaseSpringTest expectedProperties.put(author, "Nevin Nollop"); expectedProperties.put(title, "Default title"); - expectedProperties.put(description, "Gym class featuring a brown fox and lazy dog"); + expectedProperties.put(description, "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog"); assertAsyncMetadataExecute(contentMetadataExtracter, "quick/quick.carryAspectTrue_metadata.json", UNCHANGED_HASHCODE, origSize, expectedProperties, OverwritePolicy.PRAGMATIC); diff --git a/repository/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java index d034869d21..6e2d7ed452 100644 --- a/repository/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java +++ b/repository/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java @@ -84,7 +84,7 @@ public abstract class AbstractMetadataExtracterTest extends TestCase protected ApplicationContext ctx; public static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog"; - public static final String QUICK_DESCRIPTION = "Gym class featuring a brown fox and lazy dog"; + public static final String QUICK_DESCRIPTION = "Pangram, fox, dog, Gym class featuring a brown fox and lazy dog"; public static final String QUICK_CREATOR = "Nevin Nollop"; public static final String QUICK_CREATOR_EMAIL = "nevin.nollop@alfresco.com"; public static final String QUICK_PREVIOUS_AUTHOR = "Derek Hulley";