[Smartfrog-checkins] core/extras/cdl/test/org/smartfrog/test/unit/sfcore/languages/cdl/standard CdlTestUtilsTest.java,NONE,1.1 CdlResolutionTest.java,1.3,1.4 CdlSmartFrogProcessor.java,1.7,1.8 ResolutionFailureTest.java,1.2,1.3

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/extras/cdl/test/org/smartfrog/test/unit/sfcore/languages/cdl/standard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1964/extras/cdl/test/org/smartfrog/test/unit/sfcore/languages/cdl/standard

Modified Files:
	CdlResolutionTest.java CdlSmartFrogProcessor.java 
	ResolutionFailureTest.java 
Added Files:
	CdlTestUtilsTest.java 
Log Message:
Extends tests are passing.

Index: ResolutionFailureTest.java
===================================================================
RCS file: /cvsroot/smartfrog/core/extras/cdl/test/org/smartfrog/test/unit/sfcore/languages/cdl/standard/ResolutionFailureTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResolutionFailureTest.java	5 Dec 2005 17:24:12 -0000	1.2
--- ResolutionFailureTest.java	9 Dec 2005 16:09:37 -0000	1.3
***************
*** 4,7 ****
--- 4,8 ----
  import junit.framework.TestSuite;
  import org.ggf.cddlm.cdl.test.SingleDocumentTestCase;
+ import org.ggf.cddlm.generated.api.CddlmConstants;
  import org.smartfrog.test.unit.sfcore.languages.cdl.Filenames;
  
***************
*** 16,20 ****
      public static TestSuite suite() {
          return SingleDocumentTestCase.createSuite(ResolutionFailureTest.class,
!                 Filenames.NORMATIVE_INVALID_RESOLUTION,
                  new CdlSmartFrogProcessorFactory());
      }
--- 17,21 ----
      public static TestSuite suite() {
          return SingleDocumentTestCase.createSuite(ResolutionFailureTest.class,
!                 CddlmConstants.TEST_PACKAGE_CDL_INVALID_SET_01,
                  new CdlSmartFrogProcessorFactory());
      }

--- NEW FILE: CdlTestUtilsTest.java ---
/** (C) Copyright 2005 Hewlett-Packard Development Company, LP

 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) any later version.

 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.

 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 For more information: www.smartfrog.org

 */
package org.smartfrog.test.unit.sfcore.languages.cdl.standard;

import org.ggf.cddlm.cdl.test.CDLTestUtils;
import junit.framework.TestCase;

/**
 * created 08-Dec-2005 15:38:03
 */

public class CdlTestUtilsTest extends TestCase {

    public void testExtractPath() throws Exception {
        assertExtracts("c", "/a/b/c.xml");
    }

    public void testExtractNoSuffix() throws Exception {
        assertExtracts("test","/something/test");
    }

    public void testExtractNoDirs() throws Exception {
        assertExtracts("test", "test.xml");
    }

    public void testExtractNoDirsNoSuffix() throws Exception {
        assertExtracts("test", "test");
    }

    public void testExtractOneDir() throws Exception {
        assertExtracts("test", "/test.xml");
    }

    public void testExtractOneDirNoSuffix() throws Exception {
        assertExtracts("test", "/test");
    }

    public void testExtractTwoSuffix() throws Exception {
        assertExtracts("c.txt", "/a/b/c.txt.xml");
    }

    public void testExtractOutOfOrder() throws Exception {
        assertExtracts("c", "/a/b.s/c");
    }

    private void assertExtracts(String expected, String name) {
        String extracted = CDLTestUtils.extractTestName(name);
        assertEquals(expected,extracted);
    }
}

Index: CdlSmartFrogProcessor.java
===================================================================
RCS file: /cvsroot/smartfrog/core/extras/cdl/test/org/smartfrog/test/unit/sfcore/languages/cdl/standard/CdlSmartFrogProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CdlSmartFrogProcessor.java	5 Dec 2005 17:24:12 -0000	1.7
--- CdlSmartFrogProcessor.java	9 Dec 2005 16:09:37 -0000	1.8
***************
*** 40,43 ****
--- 40,45 ----
  import nu.xom.Element;
  
+ import javax.xml.namespace.QName;
+ 
  /**
   * created 25-Nov-2005 15:09:51
***************
*** 117,119 ****
--- 119,137 ----
          ser.write(document);
      }
+ 
+     /**
+      * Verify that a received fault is of the expected type. How this is done
+      * is up to the implementation; a default implementation would be to
+      * always return true.
+      * This method is called when a test declared that a fault would be thrown.
+      *
+      * @param test      the name of the test, e,g cddlm-cdl-2005-01-0001
+      * @param faultCode the fault code that was expected in this fault. Is null if the
+      *                  test document did not specify what the fault code would be
+      * @param thrown    the exception that was received
+      * @return true if the throwable was the type expected.
+      */
+     public boolean isExpectedFault(String test, QName faultCode, Throwable thrown) {
+         return true;
+     }
  }

Index: CdlResolutionTest.java
===================================================================
RCS file: /cvsroot/smartfrog/core/extras/cdl/test/org/smartfrog/test/unit/sfcore/languages/cdl/standard/CdlResolutionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CdlResolutionTest.java	2 Dec 2005 18:00:09 -0000	1.3
--- CdlResolutionTest.java	9 Dec 2005 16:09:37 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  
  import org.smartfrog.test.unit.sfcore.languages.cdl.Filenames;
+ import org.ggf.cddlm.generated.api.CddlmConstants;
  
  /**
***************
*** 13,17 ****
       */
      protected String getTestFileResourceDir() {
!         return NORMATIVE_VALID_RESOLUTION;
      }
  
--- 14,18 ----
       */
      protected String getTestFileResourceDir() {
!         return CddlmConstants.TEST_PACKAGE_CDL_SET_01;
      }