Commit 1add5278 authored by Pakulin's avatar Pakulin
Browse files

Downgraded to Java 6. 

Added one regression test
parent 150d564f

tools/XmlDiff/src/org/etsi/mts/ttcn/part9/xmldiff/XmlDiff.java

+4 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import java.io.InputStream; 
import java.io.InputStreamReader;

import java.io.Reader;

import java.io.StringReader;

import java.nio.charset.Charset;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.Arrays;
@@ -144,7 +145,8 @@ public class XmlDiff { 
			logger.severe("File not found: ", referenceXmlFile.getAbsolutePath());

			throw new XmlDiffError(e); 

		}

		Reader rd = new InputStreamReader(stream, StandardCharsets.UTF_8);

//		Reader rd = new InputStreamReader(stream, StandardCharsets.UTF_8);

		Reader rd = new InputStreamReader(stream, Charset.forName("utf-8"));

			StringReader inputReader = new StringReader(input);

		boolean v = diff(rd, inputReader, diffDetails);

		if (!v) {

tools/XmlDiff/tests/org/etsi/mts/ttcn/part9/xmldiff/TestDiff_006.java

0 → 100644
+31 −0
Original line number Diff line number Diff line 
package org.etsi.mts.ttcn.part9.xmldiff;



import static org.junit.Assert.*;



import java.io.IOException;

import java.nio.charset.StandardCharsets;

import java.nio.file.Files;

import java.nio.file.Paths;



import org.junit.Test;



public class TestDiff_006 {

	public static final String FOLDER = "xml/006_bug";

	public static final String REFERENCE_XML = "Pos_060307_unsigned_long_001.xml";

	public static final String XSD = "Pos_060307_unsigned_long_001.xsd";

	public static final String TEST_XML_TEXT = 

			"<types:e1 xmlns:types=\"schema:Pos_060307_unsigned_long_001\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">18446744073709551615</types:e1>";

	

	@Test

	public void test_generated() throws IOException, XmlDiffError {

		XmlDiff differ = new XmlDiff(FOLDER + "/" + REFERENCE_XML, 

				new String[]{XSD}, new String[]{FOLDER});

		

		StringBuilder error = new StringBuilder();

		boolean v = differ.diff(TEST_XML_TEXT, error);

		

		assertEquals("", error.toString());

		assertTrue("The XML files must be considered similar", v);

	}



}

tools/XmlDiff/xml/006_bug/Pos_060307_unsigned_long_001.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<e1

    xmlns="schema:Pos_060307_unsigned_long_001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

>18446744073709551615</e1>

tools/XmlDiff/xml/006_bug/Pos_060307_unsigned_long_001.xsd

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<schema xmlns="http://www.w3.org/2001/XMLSchema"

  targetNamespace="schema:Pos_060307_unsigned_long_001"

  xmlns:types="schema:Pos_060307_unsigned_long_001">

    <simpleType name="t1">

        <restriction base="unsignedLong"/>

    </simpleType>

    <element name="e1" type="types:t1"/>

</schema>