#30411 adding fixes

dotCMS · Dec 3, 2024 · e06b079 · e06b079
1 parent db8f96a
commit e06b079
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/...ation/src/test/java/com/dotcms/analytics/track/collectors/AsyncVanitiesCollectorTest.java b/...ation/src/test/java/com/dotcms/analytics/track/collectors/AsyncVanitiesCollectorTest.java
@@ -92,7 +92,13 @@ public void collectAsyncVanityData() throws DotDataException, IOException,
                 Collector.OBJECT, Map.of(
                         Collector.ID, testHTMLPage.getIdentifier(),
                         Collector.TITLE, TEST_PAGE_NAME,
-                        Collector.URL, TEST_PAGE_URL)
+                        Collector.URL, TEST_PAGE_URL,
+                        Collector.CONTENT_TYPE_ID, testHTMLPage.getContentType().id(),
+                        Collector.CONTENT_TYPE_NAME, testHTMLPage.getContentType().name(),
+                        Collector.CONTENT_TYPE_VAR_NAME, testHTMLPage.getContentType().variable(),
+                        Collector.BASE_TYPE, testHTMLPage.getContentType().baseType().name(),
+                        Collector.LIVE, testHTMLPage.isLive(),
+                        Collector.WORKING, testHTMLPage.isWorking())
         );
 
         final Collector collector = new AsyncVanitiesCollector();

diff --git a/...s-integration/src/test/java/com/dotcms/analytics/track/collectors/PagesCollectorTest.java b/...s-integration/src/test/java/com/dotcms/analytics/track/collectors/PagesCollectorTest.java
@@ -95,8 +95,7 @@ public void collectPageData() throws Exception {
                         Collector.CONTENT_TYPE_VAR_NAME, testPage.getContentType().variable(),
                         Collector.BASE_TYPE, testPage.getContentType().baseType().name(),
                         Collector.LIVE, testPage.isLive(),
-                        Collector.WORKING, testPage.isWorking(),
-                        Collector.DETAIL_PAGE_URL, testPage.getURI())
+                        Collector.WORKING, testPage.isWorking())
         );
 
         final Collector collector = new PagesCollector();
@@ -166,10 +165,9 @@ public void collectUrlMapPageData() throws Exception {
                         Collector.CONTENT_TYPE_ID, urlMappedContentType.id(),
                         Collector.CONTENT_TYPE_NAME, urlMappedContentType.name(),
                         Collector.CONTENT_TYPE_VAR_NAME, urlMappedContentType.variable(),
-                        Collector.BASE_TYPE, testDetailPage.getContentType().baseType().name(),
+                        Collector.BASE_TYPE, urlMappedContentType.baseType().name(),
                         Collector.LIVE, newsTestContent.isLive(),
-                        Collector.WORKING, newsTestContent.isWorking(),
-                        Collector.DETAIL_PAGE_URL, testDetailPage.getURI()
+                        Collector.WORKING, newsTestContent.isWorking()
                         )
         );
 

diff --git a/dotcms-integration/src/test/java/com/dotcms/analytics/track/collectors/Util.java b/dotcms-integration/src/test/java/com/dotcms/analytics/track/collectors/Util.java
@@ -321,9 +321,10 @@ public static void validateExpectedEntries(final Map<String, Object> expectedDat
                                 " value for key: "
                                 + mapKey, expectedMap.get(mapKey).toString(), collectedMap.get(mapKey).toString());
                     }
+                } else {
+                    assertEquals("Collected value must be equal to expected value for key: " + key,
+                            expectedValue, collectedValue);
                 }
-                assertEquals("Collected value must be equal to expected value for key: " + key,
-                        expectedValue, collectedValue);
             }
         }
     }

diff --git a/...rc/test/java/com/dotcms/analytics/track/collectors/WebEventsCollectorServiceImplTest.java b/...rc/test/java/com/dotcms/analytics/track/collectors/WebEventsCollectorServiceImplTest.java
@@ -384,8 +384,7 @@ public void testAsyncVanitiesCollector() throws DotDataException, IOException, D
                         Collector.CONTENT_TYPE_VAR_NAME, testPage.getContentType().variable(),
                         Collector.BASE_TYPE, testPage.getContentType().baseType().name(),
                         Collector.LIVE, testPage.isLive(),
-                        Collector.WORKING, testPage.isWorking(),
-                        Collector.DETAIL_PAGE_URL, testPage.getURI())
+                        Collector.WORKING, testPage.isWorking())
         );
 
         final TestEventLogSubmitter submitter = new TestEventLogSubmitter();