Author: veithen
Date: Wed Feb 26 11:44:06 2014
New Revision: 1572022
URL: http://svn.apache.org/r1572022
Log:
Some code cleanup.
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java?rev=1572022&r1=1572021&r2=1572022&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
Wed Feb 26 11:44:06 2014
@@ -20,13 +20,13 @@
*/
package test.wsdl.clash;
-import test.wsdl.filegen.FileGenTestCase;
+import test.AxisFileGenTestBase;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
-public class VerifyFilesTestCase extends FileGenTestCase {
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
public VerifyFilesTestCase(String name) {
super(name);
}
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java?rev=1572022&r1=1572021&r2=1572022&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
Wed Feb 26 11:44:06 2014
@@ -24,7 +24,9 @@ import java.io.File;
import java.util.HashSet;
import java.util.Set;
-public class AllOptionTestCase extends FileGenTestCase {
+import test.AxisFileGenTestBase;
+
+public class AllOptionTestCase extends AxisFileGenTestBase {
public AllOptionTestCase(String name) {
super(name);
}
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java?rev=1572022&r1=1572021&r2=1572022&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
Wed Feb 26 11:44:06 2014
@@ -24,12 +24,8 @@ package test.wsdl.filegen;
import test.AxisFileGenTestBase;
import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
-
public class FileGenTestCase extends AxisFileGenTestBase {
public FileGenTestCase(String name) {
@@ -51,14 +47,6 @@ public class FileGenTestCase extends Axi
}
/**
- * List of files which may or may not be generated.
- */
- protected Set mayExist() {
- HashSet set = new HashSet();
- return set;
- }
-
- /**
* The directory containing the files that should exist.
*/
protected String rootDir() {
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java?rev=1572022&r1=1572021&r2=1572022&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
Wed Feb 26 11:44:06 2014
@@ -20,13 +20,13 @@
*/
package test.wsdl.header;
-import test.wsdl.filegen.FileGenTestCase;
+import test.AxisFileGenTestBase;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
-public class VerifyFilesTestCase extends FileGenTestCase {
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
public VerifyFilesTestCase(String name) {
super(name);
}
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java?rev=1572022&r1=1572021&r2=1572022&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
Wed Feb 26 11:44:06 2014
@@ -20,13 +20,13 @@
*/
package test.wsdl.multibinding;
-import test.wsdl.filegen.FileGenTestCase;
+import test.AxisFileGenTestBase;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
-public class VerifyFilesTestCase extends FileGenTestCase {
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
public VerifyFilesTestCase(String name) {
super(name);
}
Modified:
axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisFileGenTestBase.java?rev=1572022&r1=1572021&r2=1572022&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
(original)
+++
axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
Wed Feb 26 11:44:06 2014
@@ -17,8 +17,6 @@
package test;
-import org.custommonkey.xmlunit.XMLTestCase;
-
import java.io.File;
import java.io.IOException;
import java.util.Set;
@@ -44,7 +42,15 @@ public abstract class AxisFileGenTestBas
}
}
- abstract protected Set mayExist();
+ /**
+ * List of files which may or may not be generated. May be overridden by
+ * subclasses.
+ */
+ protected Set mayExist() {
+ HashSet set = new HashSet();
+ return set;
+ }
+
abstract protected String rootDir();
abstract protected Set shouldExist();
