Index: openide/test/unit/src/org/openide/nodes/NodeLookupTest.java
===================================================================
RCS file: /cvs/openide/test/unit/src/org/openide/nodes/NodeLookupTest.java,v
retrieving revision 1.13
diff -c -r1.13 NodeLookupTest.java
*** openide/test/unit/src/org/openide/nodes/NodeLookupTest.java	3 Apr 2003 06:37:27 -0000	1.13
--- openide/test/unit/src/org/openide/nodes/NodeLookupTest.java	3 Apr 2003 09:41:19 -0000
***************
*** 138,145 ****
      }
      
      public void testFilterNodeWithOverridenGetCookieIsInTheLookup () {
!         CookieNode n = new CookieNode ();
! 
          final ArrayList queries = new ArrayList ();
          class MyFN extends FilterNode {
              public MyFN (Node n) {
--- 138,154 ----
      }
      
      public void testFilterNodeWithOverridenGetCookieIsInTheLookup () {
!         doTestFilterNodeWithOverridenGetCookieIsInTheLookup (new CookieNode (), false);
!     }
!     
!     public void testFilterNodeWithOverridenGetCookieIsInTheLookupWitSaveCookieWithoutQuery () {
!         doTestFilterNodeWithOverridenGetCookieIsInTheLookup (new CookieNodeWithCookie (), false);
!     }
!     
!     public void testFilterNodeWithOverridenGetCookieIsInTheLookupWitSaveCookie () {
!         doTestFilterNodeWithOverridenGetCookieIsInTheLookup (new CookieNodeWithCookie (), true);
!     }
!     private void doTestFilterNodeWithOverridenGetCookieIsInTheLookup (CookieNode n, boolean queryForCookie) {
          final ArrayList queries = new ArrayList ();
          class MyFN extends FilterNode {
              public MyFN (Node n) {
***************
*** 158,163 ****
--- 167,176 ----
          
          Lookup l = fn.getLookup ();
          
+         if (queryForCookie) {
+             l.lookup (SaveCookie.class);
+         }
+         
          // == must be used instead of equals for nodes!!!
          assertTrue ("Node is there", fn == l.lookup (Node.class));
          Collection c = l.lookup (new Lookup.Template (Node.class)).allInstances ();
***************
*** 166,177 ****
      }
      
      public void testFilterNodeThatDoesNotOverrideGetCookie () {
!         CookieNode n = new CookieNode ();
          
          FilterNode fn = new FilterNode (n);
          checkGetNodesDoesNotInitializeLookup (fn, n.queries);
          
          Lookup l = fn.getLookup ();
          // == must be used instead of equals for nodes!!!
          assertTrue ("Node is there", fn == l.lookup (Node.class));
          Collection c = l.lookup (new Lookup.Template (Node.class)).allInstances ();
--- 179,197 ----
      }
      
      public void testFilterNodeThatDoesNotOverrideGetCookie () {
!         doTestFilterNodeThatDoesNotOverrideGetCookie (new CookieNode ());
!     }
!     
!     public void testFilterNodeThatDoesNotOverrideGetCookieWithSaveCookie () {
!         doTestFilterNodeThatDoesNotOverrideGetCookie (new CookieNodeWithCookie ());
!     }
          
+     private void doTestFilterNodeThatDoesNotOverrideGetCookie (CookieNode n) {
          FilterNode fn = new FilterNode (n);
          checkGetNodesDoesNotInitializeLookup (fn, n.queries);
          
          Lookup l = fn.getLookup ();
+         
          // == must be used instead of equals for nodes!!!
          assertTrue ("Node is there", fn == l.lookup (Node.class));
          Collection c = l.lookup (new Lookup.Template (Node.class)).allInstances ();
***************
*** 408,415 ****
--- 428,444 ----
              queries.add (c);
              return super.getCookie (c);
          }
+         
      } // end of CookieNode
      
+     private static final class CookieNodeWithCookie extends CookieNode implements SaveCookie {
+         public CookieNodeWithCookie () {
+             cookieSet ().add (this);
+         }
+         
+         public void save () {
+         }
+     }
      
      private static class CountableLookup extends AbstractLookup {
          public final InstanceContent ic;