butek 02/02/04 07:34:09
Modified: java/test/wsdl/filegen FileGenTestCase.java
Added: java/test/wsdl/clash VerifyFilesTestCase.java
java/test/wsdl/filegen README
java/test/wsdl/multibinding VerifyFilesTestCase.java
Log:
FileGenTestCase verifies whether or not certain files have been generated. This is
a task that could be used elsewhere, so I've modified this test to be extensible,
and added a couple extensions.
Revision Changes Path
1.1 xml-axis/java/test/wsdl/clash/VerifyFilesTestCase.java
Index: VerifyFilesTestCase.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
* This tests the file generation of only the items that are referenced in WSDL
*
*/
package test.wsdl.clash;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
import test.wsdl.filegen.FileGenTestCase;
public class VerifyFilesTestCase extends FileGenTestCase {
public VerifyFilesTestCase(String name) {
super(name);
}
/**
* List of files which should be generated.
*/
protected Set shouldExist() {
HashSet set = new HashSet();
set.add("AnotherNonSharedNameImpl.java");
set.add("AnotherNonSharedNameSkeleton.java");
set.add("AnotherNonSharedNameStub.java");
set.add("NonSharedNameImpl.java");
set.add("NonSharedNameSkeleton.java");
set.add("NonSharedNameStub.java");
set.add("SharedName_Binding.java");
set.add("SharedName_BindingImpl.java");
set.add("SharedName_BindingSkeleton.java");
set.add("SharedName_BindingStub.java");
set.add("SharedName_Port.java");
set.add("SharedName_Service.java");
set.add("SharedName_ServiceTestCase.java");
set.add("SharedName_Type.java");
set.add("VerifyFilesTestCase.java");
set.add("deploy.wsdd");
set.add("undeploy.wsdd");
return set;
} // shouldExist
/**
* The directory containing the files that should exist.
*/
protected String rootDir() {
return "build" + File.separator + "work" + File.separator +
"test" + File.separator + "wsdl" + File.separator +
"clash";
} // rootDir
} // class VerifyFilesTestCase
1.2 +45 -31 xml-axis/java/test/wsdl/filegen/FileGenTestCase.java
Index: FileGenTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/filegen/FileGenTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileGenTestCase.java 10 Dec 2001 21:19:04 -0000 1.1
+++ FileGenTestCase.java 4 Feb 2002 15:34:09 -0000 1.2
@@ -60,55 +60,69 @@
*/
package test.wsdl.filegen;
-import junit.framework.Assert;
import junit.framework.TestCase;
import java.io.File;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Vector;
+
public class FileGenTestCase extends junit.framework.TestCase {
public FileGenTestCase(String name) {
super(name);
}
- // List of files which should be generated
- private static String[] shouldExist= new String[] {
- "PortTypeSoap.java",
- "ReferenceService.java",
- "ReferenceSoapBindingStub.java",
- "OpFault.java"
- };
-
- // List of files which should NOT be generated
- private static String[] shouldNotExist= new String[] {
- "InvalidTickerFaultMessage.java",
- "PortTypeNotSoap.java",
- "ReferenceHttpGetStub.java",
- "Address.java",
- "AddressHolder.java",
- "StateType.java",
- "StateTypeHolder.java"
- };
+ /**
+ * List of files which should be generated.
+ */
+ protected Set shouldExist() {
+ HashSet set = new HashSet();
+ set.add("FileGenTestCase.java");
+ set.add("OpFault.java");
+ set.add("PortTypeSoap.java");
+ set.add("ReferenceService.java");
+ set.add("ReferenceSoapBindingStub.java");
+ return set;
+ }
+ /**
+ * The directory containing the files that should exist.
+ */
+ protected String rootDir() {
+ return "build" + File.separator + "work" + File.separator +
+ "test" + File.separator + "wsdl" + File.separator +
+ "filegen";
+ }
+
public void testFileGen() throws IOException {
- String rootDir = "build"+ File.separator + "work" + File.separator +
- "test" + File.separator + "wsdl" + File.separator + "filegen";
+ String rootDir = rootDir();
+ Set shouldExist = shouldExist();
+
// open up the output directory and check what files exist.
File outputDir = new File(rootDir);
String[] files = outputDir.list();
-
- for (int i=0; i < shouldExist.length; i++) {
- File f = new File(rootDir, shouldExist[i]);
- //System.out.println(shouldExist[i] + " : " + f.exists());
- assertTrue("File does not exist (and it should): " + shouldExist[i],
f.exists());
+
+ Vector shouldNotExist = new Vector();
+
+ for (int i = 0; i < files.length; ++i) {
+ if (shouldExist.contains(files[i])) {
+ shouldExist.remove(files[i]);
+ }
+ else {
+ shouldNotExist.add(files[i]);
+ }
}
-
- for (int i=0; i < shouldNotExist.length; i++) {
- File f = new File(rootDir, shouldNotExist[i]);
- //System.out.println(shouldNotExist[i] + " : " + f.exists());
- assertTrue("File exist (and it should NOT): " + shouldNotExist[i],
!f.exists());
+
+ if (shouldExist.size() > 0) {
+ fail("The following files should exist but do not: " + shouldExist);
+ }
+
+ if (shouldNotExist.size() > 0) {
+ fail("The following files should NOT exist, but do: " +
shouldNotExist);
}
}
}
1.1 xml-axis/java/test/wsdl/filegen/README
Index: README
===================================================================
FileGenTestCase verifies that the proper set of files is generated for FileGen.wsdl.
This is a test that would be useful for many WSDL files, so FileGenTestCase is also
extensible.
Here is the interface for FileGenTestCase:
FileGenTestCase {
public FileGenTestCase(java.lang.String);
protected java.util.Set shouldExist();
protected java.lang.String rootDir();
public void testFileGen() throws java.io.IOException;
}
All extensions should have a constructor that takes a String and calls
super(string). This is a requirement of the junit framework.
All extensions should override shouldExist. This method returns a set containing
the String local names of the files that should exist in a given directory.
All extensions should override rootDir. This method returns the name of the
directory which will be checked for file existence.
testFileGen is the test that does all the work and extensions do not need to
override it.
For a concrete example of an extension to FileGenTestCase, see
xml-axis/java/test/wsdl/clash/VerifyFilesTestCase.java.
1.1 xml-axis/java/test/wsdl/multibinding/VerifyFilesTestCase.java
Index: VerifyFilesTestCase.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
* This tests the file generation of only the items that are referenced in WSDL
*
*/
package test.wsdl.multibinding;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
import test.wsdl.filegen.FileGenTestCase;
public class VerifyFilesTestCase extends FileGenTestCase {
public VerifyFilesTestCase(String name) {
super(name);
}
/**
* List of files which should be generated.
*/
protected Set shouldExist() {
HashSet set = new HashSet();
set.add("BindingAllLit.java");
set.add("BindingAllLitImpl.java");
set.add("BindingAllLitSkeleton.java");
set.add("BindingAllLitStub.java");
set.add("BindingNoLitImpl.java");
set.add("BindingNoLitSkeleton.java");
set.add("BindingNoLitStub.java");
set.add("BindingSomeLit.java");
set.add("BindingSomeLitImpl.java");
set.add("BindingSomeLitSkeleton.java");
set.add("BindingSomeLitStub.java");
set.add("MbPT.java");
set.add("MbService.java");
set.add("MbServiceTestCase.java");
set.add("VerifyFilesTestCase.java");
set.add("deploy.wsdd");
set.add("undeploy.wsdd");
return set;
} // shouldExist
/**
* The directory containing the files that should exist.
*/
protected String rootDir() {
return "build" + File.separator + "work" + File.separator +
"test" + File.separator + "wsdl" + File.separator +
"multibinding";
} // rootDir
} // class VerifyFilesTestCase
