You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/16 18:09:40 UTC
svn commit: r1779075 - in /axis/axis2/java/core/branches/hermetic-tests: ./
modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java
modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Author: veithen
Date: Mon Jan 16 18:09:40 2017
New Revision: 1779075
URL: http://svn.apache.org/viewvc?rev=1779075&view=rev
Log:
Merge latest changes from trunk.
Modified:
axis/axis2/java/core/branches/hermetic-tests/ (props changed)
axis/axis2/java/core/branches/hermetic-tests/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Propchange: axis/axis2/java/core/branches/hermetic-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 16 18:09:40 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1779063-1779069
+/axis/axis2/java/core/trunk:1779063-1779074
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java?rev=1779075&r1=1779074&r2=1779075&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java Mon Jan 16 18:09:40 2017
@@ -23,29 +23,24 @@ import java.io.File;
import org.apache.axis2.wsdl.codegen.XMLSchemaTest;
import org.apache.ws.commons.schema.XmlSchema;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+@RunWith(JUnit4.class)
public class SchemaWriterTest extends XMLSchemaTest{
- private SchemaWriter writer;
-
-
- @Override
- protected void setUp() throws Exception {
- writer=new SchemaWriter(new File(customDirectoryLocation));
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- writer=null;
- super.tearDown();
- }
+ @Rule
+ public final TemporaryFolder tmpFolder = new TemporaryFolder();
@Test
public void testWriteSchema() throws Exception{
+ File baseFolder = tmpFolder.getRoot();
+ SchemaWriter writer = new SchemaWriter(baseFolder);
XmlSchema schema=loadSingleSchemaFile(1);
writer.writeSchema(schema, "generated.xsd");
- String s1=readXMLfromSchemaFile(customDirectoryLocation+"generated.xsd");
+ String s1=readXMLfromSchemaFile(new File(baseFolder, "generated.xsd").getPath());
String s2=readXMLfromSchemaFile(customDirectoryLocation+"sampleSchema1.xsd");
assertSimilarXML(s1, s2);
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1779075&r1=1779074&r2=1779075&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Mon Jan 16 18:09:40 2017
@@ -167,7 +167,13 @@ public class RepositoryListener implemen
classPath = ".";
}
File root = new File(classPath);
- File[] files = root.listFiles();
+ File[] files;
+ try {
+ files = root.listFiles();
+ } catch (SecurityException ex) {
+ // Ignore
+ files = null;
+ }
if (files != null) {
for (int i = 0; i < files.length; i++) {
File file = files[i];