Author: veithen
Date: Mon May 25 20:31:10 2015
New Revision: 1681650
URL: http://svn.apache.org/r1681650
Log:
Rename getShortName to getName to align the interface of XMLSample with that of
SOAPSample.
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
webservices/axiom/trunk/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
Mon May 25 20:31:10 2015
@@ -70,7 +70,7 @@ public class StreamingOMSerializerTest e
TestSuite suite = new TestSuite();
for (Iterator it = Multiton.getInstances(XMLSample.class).iterator();
it.hasNext(); ) {
XMLSample file = (XMLSample)it.next();
- suite.addTest(new StreamingOMSerializerTest(file.getShortName(),
file));
+ suite.addTest(new StreamingOMSerializerTest(file.getName(), file));
}
return suite;
}
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
(original)
+++
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
Mon May 25 20:31:10 2015
@@ -36,7 +36,7 @@ public class TestGetNamespaceContext ext
public TestGetNamespaceContext(StAXImplementation staxImpl, XMLSample
testResource) {
super(staxImpl);
this.testResource = testResource;
- addTestParameter("file", testResource.getShortName());
+ addTestParameter("file", testResource.getName());
}
// Copy & paste from XMLStreamReaderComparator
Modified:
webservices/axiom/trunk/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
Mon May 25 20:31:10 2015
@@ -45,7 +45,7 @@ public class StreamSourceToOMResultTest
omMetaFactory = OMAbstractFactory.getMetaFactory(axiomImplementation);
this.file = file;
addTestParameter("axiomImplementation", axiomImplementation);
- addTestParameter("file", file.getShortName());
+ addTestParameter("file", file.getName());
}
protected void runTest() throws Throwable {
Modified:
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
(original)
+++
webservices/axiom/trunk/systests/integration-tests/src/test/java/org/apache/axiom/om/SAXResultSAXParserTest.java
Mon May 25 20:31:10 2015
@@ -70,7 +70,7 @@ public class SAXResultSAXParserTest exte
private static void addTests(TestSuite suite, SAXParserFactory factory,
String name) throws Exception {
for (XMLSample file : getInstances(XMLSample.class)) {
suite.addTest(new SAXResultSAXParserTest(
- file.getShortName() + " - " + name, factory, file));
+ file.getName() + " - " + name, factory, file));
}
}
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java
Mon May 25 20:31:10 2015
@@ -32,6 +32,6 @@ public abstract class ConformanceTestCas
public ConformanceTestCase(OMMetaFactory metaFactory, XMLSample file) {
super(metaFactory);
this.file = file;
- addTestParameter("file", file.getShortName());
+ addTestParameter("file", file.getName());
}
}
Modified:
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java
(original)
+++
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java
Mon May 25 20:31:10 2015
@@ -32,7 +32,7 @@ public class TestCloneNode extends DOMTe
public TestCloneNode(DocumentBuilderFactory dbf, XMLSample file) {
super(dbf);
this.file = file;
- addTestParameter("file", file.getShortName());
+ addTestParameter("file", file.getName());
}
protected void runTest() throws Throwable {
Modified:
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java?rev=1681650&r1=1681649&r2=1681650&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
(original)
+++
webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
Mon May 25 20:31:10 2015
@@ -41,16 +41,16 @@ public final class XMLSample extends Mul
public static final XMLSample LARGE = new XMLSample("large.xml");
private final String resourceName;
- private final String shortName;
+ private final String name;
private XMLSampleProperties properties;
private XMLSample(String relativeResourceName) {
resourceName = "org/apache/axiom/ts/xml/" + relativeResourceName;
- shortName = resourceName.substring(resourceName.lastIndexOf('/')+1);
+ name = resourceName.substring(resourceName.lastIndexOf('/')+1);
}
- public String getShortName() {
- return shortName;
+ public String getName() {
+ return name;
}
private synchronized XMLSampleProperties getProperties() {
