ff-attic/x4o
2
0
Fork 0
Code Issues 2 Pull requests Activity

Added multi jvm test script and removed J2SE-1.5 compile errors.

Browse source
This commit is contained in:
Willem Cazander 2013-08-09 00:51:53 +02:00
parent 6f2815491b
commit 0ac4faa613
7 changed files with 133 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x4o-driver/src/main/java/org/x4o/xml/X4ODriverManager.java
View file

@ -164,7 +164,7 @@ public final class X4ODriverManager {
if (language==null) {
throw new NullPointerException("Can't provider driver for null language.");
}
if (language.isEmpty()) {
if (language.length()==0) {
throw new IllegalArgumentException("Can't provider driver for empty language.");
}
if (instance.drivers.containsKey(language)) {

2
x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassBase.java
View file

@ -99,7 +99,7 @@ public abstract class AbstractElementClassBase extends AbstractElementMetaBase i
if (namespaceUri==null) {
throw new NullPointerException("Can't add parent tag with null namespace uri.");
}
if (namespaceUri.isEmpty()) {
if (namespaceUri.length()==0) {
throw new IllegalArgumentException("Can't add parent tag with empty namespace uri.");
}
List<String> tags = elementParents.get(namespaceUri);

7
x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterContextTest.java
View file

@ -26,7 +26,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Scanner;
import org.x4o.xml.X4ODriver;
import org.x4o.xml.element.Element;
@ -76,7 +75,7 @@ public class X4OWriterContextTest extends TestCase {
X4OWriterContext<TestObjectRoot> writer = driver.createWriterContext();
writer.writeFileContext(createContext(), outputFile);
String text = new Scanner( outputFile ).useDelimiter("\\A").next();
String text = X4OWriterTest.readFile( outputFile );
outputFile.delete();
assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -107,7 +106,7 @@ public class X4OWriterContextTest extends TestCase {
X4OWriterContext<TestObjectRoot> writer = driver.createWriterContext();
writer.writeFileContext(createContext(), outputFile.getAbsolutePath());
String text = new Scanner( outputFile ).useDelimiter("\\A").next();
String text = X4OWriterTest.readFile( outputFile );
outputFile.delete();
assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -143,7 +142,7 @@ public class X4OWriterContextTest extends TestCase {
} finally {
outputStream.close();
}
String text = new Scanner( outputFile ).useDelimiter("\\A").next();
String text = X4OWriterTest.readFile( outputFile );
outputFile.delete();
assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));

31
x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterTest.java
View file

@ -23,11 +23,15 @@
package org.x4o.xml.io;
import java.awt.Component;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.Scanner;
import java.nio.charset.Charset;
import org.x4o.xml.X4ODriver;
import org.x4o.xml.io.X4OReader;
@ -47,13 +51,30 @@ import junit.framework.TestCase;
*/
public class X4OWriterTest extends TestCase {
private File createOutputFile() throws IOException {
File outputFile = File.createTempFile("test-writer", ".xml");
outputFile.deleteOnExit();
return outputFile;
}
static public String readFile(File file) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),Charset.forName("UTF-8")));
try {
StringBuilder sb = new StringBuilder();
String line = br.readLine();
while (line != null) {
sb.append(line);
sb.append('\n');
line = br.readLine();
}
String out = sb.toString();
//System.out.println(out);
return out;
} finally {
br.close();
}
}
public void testWriterSwiXmlOutput() throws Exception {
Accelerator3 ac3 = new Accelerator3(false);
SwingEngine engine = new SwingEngine(ac3);
@ -86,7 +107,7 @@ public class X4OWriterTest extends TestCase {
TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml");
writer.writeFile(root, outputFile);
String text = new Scanner( outputFile ).useDelimiter("\\A").next();
String text = readFile( outputFile );
outputFile.delete();
assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -103,7 +124,7 @@ public class X4OWriterTest extends TestCase {
TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml");
writer.writeFile(root, outputFile.getAbsolutePath());
String text = new Scanner( outputFile ).useDelimiter("\\A").next();
String text = readFile( outputFile );
outputFile.delete();
assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -127,7 +148,7 @@ public class X4OWriterTest extends TestCase {
}
writer.writeFile(root, outputFile.getAbsolutePath());
String text = new Scanner( outputFile ).useDelimiter("\\A").next();
String text = readFile( outputFile );
outputFile.delete();
assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));