[tapestry-5] 03/03: TAP-2742: fixing tests in ComponentDependencyRegistryImplTest

[thiagohp]

This is an automated email from the ASF dual-hosted git repository.

thiagohp pushed a commit to branch better-page-invalidation
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git

commit 5de00a282dc1879c808802081f2c3d1211c55807
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Apr 29 17:08:30 2023 -0300

    TAP-2742: fixing tests in ComponentDependencyRegistryImplTest
---
 .../ComponentDependencyRegistryImplTest.java       | 46 +++-------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git 
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
 
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
index fcb776d6a..c3dd3ff7a 100644
--- 
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
+++ 
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
@@ -60,7 +60,6 @@ import org.apache.tapestry5.corelib.components.TextOutput;
 import org.apache.tapestry5.corelib.components.Zone;
 import org.apache.tapestry5.corelib.mixins.FormGroup;
 import org.apache.tapestry5.corelib.mixins.RenderDisabled;
-import org.apache.tapestry5.corelib.pages.PropertyDisplayBlocks;
 import org.apache.tapestry5.corelib.pages.PropertyEditBlocks;
 import org.apache.tapestry5.integration.app1.components.Border;
 import org.apache.tapestry5.integration.app1.components.ErrorComponent;
@@ -71,7 +70,6 @@ import org.apache.tapestry5.integration.app1.mixins.EchoValue;
 import org.apache.tapestry5.integration.app1.mixins.EchoValue2;
 import org.apache.tapestry5.integration.app1.mixins.TextOnlyOnDisabled;
 import org.apache.tapestry5.integration.app1.pages.AlertsDemo;
-import 
org.apache.tapestry5.integration.app1.pages.BeanEditorWithFormFragmentDemo;
 import org.apache.tapestry5.integration.app1.pages.BlockCaller;
 import org.apache.tapestry5.integration.app1.pages.BlockHolder;
 import 
org.apache.tapestry5.integration.app1.pages.EmbeddedComponentTypeConflict;
@@ -295,11 +293,10 @@ public class ComponentDependencyRegistryImplTest
         
         // Dynamic dependency definitions
         componentDependencyRegistry.register(PropertyDisplay.class);
-        assertDependencies(PropertyDisplay.class, 
-                PropertyDisplayBlocks.class, AbstractPropertyOutput.class);
+        assertDependencies(PropertyDisplay.class, 
AbstractPropertyOutput.class);
 
         componentDependencyRegistry.register(PropertyEditor.class);
-        assertDependencies(PropertyEditor.class, PropertyEditBlocks.class);
+        assertDependencies(PropertyEditor.class);
         
         // Superclass
         componentDependencyRegistry.register(EventLink.class);
@@ -308,11 +305,6 @@ public class ComponentDependencyRegistryImplTest
         assertDependencies(AbstractComponentEventLink.class, 
AbstractLink.class);
         assertDependencies(AbstractLink.class);        
         
-        // @InjectPage and circular dependencies
-        componentDependencyRegistry.register(BlockCaller.class);
-        assertDependencies(BlockCaller.class, BlockHolder.class);
-        assertDependencies(BlockHolder.class, BlockCaller.class);        
-        
         // @InjectComponent 
         // Components declared in templates
         componentDependencyRegistry.register(AlertsDemo.class);
@@ -352,32 +344,6 @@ public class ComponentDependencyRegistryImplTest
 
     }
     
-    @Test
-    public void getCircularDependencies()
-    {
-//        componentDependencyRegistry.clear();
-//        componentDependencyRegistry.register(BeanEditor.class);
-//        Set<String> expected = setOf(PropertyEditor.class, 
PropertyEditBlocks.class);
-//        assertEquals(expected, 
-//                
componentDependencyRegistry.getCircularDependencies(BeanEditor.class.getName()));
-//        
-//        componentDependencyRegistry.register(BlockCaller.class);
-//        assertEquals(setOf(BlockHolder.class), 
-//                
componentDependencyRegistry.getCircularDependencies(BlockCaller.class.getName()));
-//        assertEquals(setOf(BlockCaller.class), 
-//                
componentDependencyRegistry.getCircularDependencies(BlockHolder.class.getName()));
-//        
-//        // An infinite recursion happened in this call.
-//        componentDependencyRegistry.register(Index.class);
-//        assertEquals(new HashSet<String>(), 
-//                
componentDependencyRegistry.getCircularDependencies(Delegate.class.getName()));
-        
-        
componentDependencyRegistry.register(BeanEditorWithFormFragmentDemo.class);
-        
-        ComponentDependencyGraphvizGenerator generator = new 
ComponentDependencyGraphvizGeneratorImpl(componentDependencyRegistry, resolver);
-        
System.out.println(generator.generate(BeanEditorWithFormFragmentDemo.class.getName()));
-    }
-
     private void assertDependencies(Class clasz, Class... dependencies) {
         assertEquals(
                 setOf(dependencies),
@@ -391,10 +357,10 @@ public class ComponentDependencyRegistryImplTest
             .collect(Collectors.toSet());
     }
 
-    private static Set<String> setOf(String ... strings)
-    {
-        return new HashSet<>(Arrays.asList(strings));
-    }
+//    private static Set<String> setOf(String ... strings)
+//    {
+//        return new HashSet<>(Arrays.asList(strings));
+//    }
     
     private void add(String component, String dependency)
     {