[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/notifications ...

Manik Surtani manik at jboss.org
Mon Jul 2 06:49:04 EDT 2007


  User: msurtani
  Date: 07/07/02 06:49:04

  Modified:    tests/functional/org/jboss/cache/notifications 
                        AnnotationsTest.java
  Log:
  Added tests to ensure listener class and methods are public
  
  Revision  Changes    Path
  1.2       +133 -91   JBossCache/tests/functional/org/jboss/cache/notifications/AnnotationsTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AnnotationsTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/notifications/AnnotationsTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AnnotationsTest.java	28 Jun 2007 16:53:36 -0000	1.1
  +++ AnnotationsTest.java	2 Jul 2007 10:49:04 -0000	1.2
  @@ -28,34 +28,14 @@
   
      public void testControl()
      {
  -      @CacheListener
  -      class Listener
  -      {
  -         @CacheStarted
  -         @CacheStopped
  -         public void callback(Event e)
  -         {
  -            System.out.println("Hello");
  -         }
  -      }
  -
  -      Listener l = new Listener();
  +      Object l = new TestControlListener();
         n.addCacheListener(l);
         assertEquals(1, n.getCacheListeners().size());
      }
   
      public void testCacheListenerNoMethods()
      {
  -      @CacheListener
  -      class Listener
  -      {
  -         public String toString()
  -         {
  -            return "Hello";
  -         }
  -      }
  -
  -      Listener l = new Listener();
  +      Object l = new TestCacheListenerNoMethodsListener();
         n.addCacheListener(l);
         assertEquals("Hello", l.toString());
         assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty()); // since the valid listener has no methods to listen
  @@ -63,19 +43,26 @@
   
      public void testNonAnnotatedListener()
      {
  -      class Listener
  +      Object l = new TestNonAnnotatedListener();
  +      try
         {
  -         public String toString()
  +         n.addCacheListener(l);
  +         fail("Should not accept an un-annotated cache listener");
  +      }
  +      catch (IncorrectCacheListenerException icle)
            {
  -            return "Hello";
  +         // expected
            }
  +      assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
         }
   
  -      Listener l = new Listener();
  +   public void testNonPublicListener()
  +   {
  +      Object l = new TestNonPublicListener();
         try
         {
            n.addCacheListener(l);
  -         fail("Should not accept an un-annotated cache listener");
  +         fail("Should not accept a private callback class");
         }
         catch (IncorrectCacheListenerException icle)
         {
  @@ -84,19 +71,19 @@
         assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
      }
   
  -   public void testNonVoidReturnTypeListener()
  +   public void testNonPublicListenerMethod()
      {
  -      @CacheListener
  -      class Listener
  -      {
  -         @CacheStarted
  -         public String callback(Event e)
  -         {
  -            return "Hello";
  -         }
  +      Object l = new TestNonPublicListenerMethodListener();
  +      n.addCacheListener(l);
  +
  +      // should not fail, should just not register anything
  +
  +      assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
         }
   
  -      Listener l = new Listener();
  +   public void testNonVoidReturnTypeMethod()
  +   {
  +      Object l = new TestNonVoidReturnTypeMethodListener();
         try
         {
            n.addCacheListener(l);
  @@ -112,16 +99,7 @@
   
      public void testIncorrectMethodSignature1()
      {
  -      @CacheListener
  -      class Listener
  -      {
  -         @CacheStarted
  -         public void callback()
  -         {
  -         }
  -      }
  -
  -      Listener l = new Listener();
  +      Object l = new TestIncorrectMethodSignature1Listener();
         try
         {
            n.addCacheListener(l);
  @@ -136,16 +114,22 @@
   
      public void testIncorrectMethodSignature2()
      {
  -      @CacheListener
  -      class Listener
  +      Object l = new TestIncorrectMethodSignature2Listener();
  +      try
         {
  -         @CacheStarted
  -         public void callback(Event e, String s)
  +         n.addCacheListener(l);
  +         fail("Should not accept a cache listener with a bad method signature");
  +      }
  +      catch (IncorrectCacheListenerException icle)
            {
  +         // expected
            }
  +      assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
         }
   
  -      Listener l = new Listener();
  +   public void testIncorrectMethodSignature3()
  +   {
  +      Object l = new TestIncorrectMethodSignature3Listener();
         try
         {
            n.addCacheListener(l);
  @@ -158,18 +142,24 @@
         assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
      }
   
  -   public void testIncorrectMethodSignature3()
  +   public void testUnassignableMethodSignature()
      {
  -      @CacheListener
  -      class Listener
  +      Object l = new TestUnassignableMethodSignatureListener();
  +      try
         {
  -         @CacheStarted
  -         public void callback(Event e, String... s)
  +         n.addCacheListener(l);
  +         fail("Should not accept a cache listener with a bad method signature");
  +      }
  +      catch (IncorrectCacheListenerException icle)
            {
  +         // expected
            }
  +      assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
         }
   
  -      Listener l = new Listener();
  +   public void testPartlyUnassignableMethodSignature()
  +   {
  +      Object l = new TestPartlyUnassignableMethodSignatureListener();
         try
         {
            n.addCacheListener(l);
  @@ -179,55 +169,107 @@
         {
            // expected
         }
  -      assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
      }
   
  -   public void testUnassignableMethodSignature()
  +   @CacheListener
  +   public class TestControlListener
  +   {
  +      @CacheStarted
  +      @CacheStopped
  +      public void callback(Event e)
  +      {
  +         System.out.println("Hello");
  +      }
  +   }
  +
  +   @CacheListener
  +   public class TestCacheListenerNoMethodsListener
  +   {
  +      public String toString()
  +      {
  +         return "Hello";
  +      }
  +   }
  +
  +   public class TestNonAnnotatedListener
  +   {
  +      public String toString()
      {
  +         return "Hello";
  +      }
  +   }
  +
         @CacheListener
  -      class Listener
  +   protected class TestNonPublicListener
         {
            @CacheStarted
  -         public void callback(NodeMovedEvent nme)
  +      public void callback()
            {
            }
         }
   
  -      Listener l = new Listener();
  -      try
  +   @CacheListener
  +   public class TestNonPublicListenerMethodListener
  +   {
  +      @CacheStarted
  +      protected void callback(Event e)
         {
  -         n.addCacheListener(l);
  -         fail("Should not accept a cache listener with a bad method signature");
         }
  -      catch (IncorrectCacheListenerException icle)
  +   }
  +
  +   @CacheListener
  +   public class TestNonVoidReturnTypeMethodListener
         {
  -         // expected
  +      @CacheStarted
  +      public String callback(Event e)
  +      {
  +         return "Hello";
         }
  -      assertTrue("No listeners should be registered.", n.getCacheListeners().isEmpty());
      }
   
  -   public void testPartlyUnassignableMethodSignature()
  +   @CacheListener
  +   public class TestIncorrectMethodSignature1Listener
      {
  +      @CacheStarted
  +      public void callback()
  +      {
  +      }
  +   }
  +
         @CacheListener
  -      class Listener
  +   public class TestIncorrectMethodSignature2Listener
         {
  -         @NodeMoved
            @CacheStarted
  -         public void callback(NodeMovedEvent nme) // sig valid for NodeMoved but not CacheStarted
  +      public void callback(Event e, String s)
            {
            }
         }
   
  -      Listener l = new Listener();
  -      try
  +   @CacheListener
  +   public class TestIncorrectMethodSignature3Listener
  +   {
  +      @CacheStarted
  +      public void callback(Event e, String... s)
         {
  -         n.addCacheListener(l);
  -         fail("Should not accept a cache listener with a bad method signature");
         }
  -      catch (IncorrectCacheListenerException icle)
  +   }
  +
  +   @CacheListener
  +   public class TestUnassignableMethodSignatureListener
  +   {
  +      @CacheStarted
  +      public void callback(NodeMovedEvent nme)
         {
  -         // expected
         }
      }
   
  +   @CacheListener
  +   public class TestPartlyUnassignableMethodSignatureListener
  +   {
  +      @NodeMoved
  +      @CacheStarted
  +      public void callback(NodeMovedEvent nme) // sig valid for NodeMoved but not CacheStarted
  +      {
  +      }
  +   }
   }
  
  
  



More information about the jboss-cvs-commits mailing list