You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2010/06/26 23:39:34 UTC
svn commit: r958289 -
/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
Author: maartenc
Date: Sat Jun 26 21:39:34 2010
New Revision: 958289
URL: http://svn.apache.org/viewvc?rev=958289&view=rev
Log:
"_dest" renamed to "dest"
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java?rev=958289&r1=958288&r2=958289&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java Sat Jun 26 21:39:34 2010
@@ -43,7 +43,7 @@ public class XmlModuleDescriptorWriterTe
}
}
- private File _dest = new File("build/test/test-write.xml");
+ private File dest = new File("build/test/test-write.xml");
public void testSimple() throws Exception {
DefaultModuleDescriptor md = (DefaultModuleDescriptor) XmlModuleDescriptorParser
@@ -52,10 +52,10 @@ public class XmlModuleDescriptorWriterTe
md.setResolvedPublicationDate(new GregorianCalendar(2005, 4, 1, 11, 0, 0).getTime());
md.setResolvedModuleRevisionId(new ModuleRevisionId(md.getModuleRevisionId().getModuleId(),
"NONE"));
- XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
+ XmlModuleDescriptorWriter.write(md, LICENSE, dest);
- assertTrue(_dest.exists());
- String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+ assertTrue(dest.exists());
+ String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))).replaceAll(
"\r\n", "\n").replace('\r', '\n');
String expected = readEntirely("test-write-simple.xml").replaceAll("\r\n", "\n").replace(
'\r', '\n');
@@ -69,10 +69,10 @@ public class XmlModuleDescriptorWriterTe
md.setResolvedPublicationDate(new GregorianCalendar(2005, 4, 1, 11, 0, 0).getTime());
md.setResolvedModuleRevisionId(new ModuleRevisionId(md.getModuleRevisionId().getModuleId(),
"NONE"));
- XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
+ XmlModuleDescriptorWriter.write(md, LICENSE, dest);
- assertTrue(_dest.exists());
- String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+ assertTrue(dest.exists());
+ String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))).replaceAll(
"\r\n", "\n").replace('\r', '\n');
String expected = readEntirely("test-write-info.xml").replaceAll("\r\n", "\n").replace(
'\r', '\n');
@@ -83,10 +83,10 @@ public class XmlModuleDescriptorWriterTe
ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
new IvySettings(),
XmlModuleDescriptorWriterTest.class.getResource("test-dependencies.xml"), true);
- XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
+ XmlModuleDescriptorWriter.write(md, LICENSE, dest);
- assertTrue(_dest.exists());
- String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+ assertTrue(dest.exists());
+ String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))).replaceAll(
"\r\n", "\n").replace('\r', '\n');
String expected = readEntirely("test-write-dependencies.xml").replaceAll("\r\n", "\n")
.replace('\r', '\n');
@@ -96,10 +96,10 @@ public class XmlModuleDescriptorWriterTe
public void testFull() throws Exception {
ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
new IvySettings(), XmlModuleDescriptorWriterTest.class.getResource("test.xml"), false);
- XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
+ XmlModuleDescriptorWriter.write(md, LICENSE, dest);
- assertTrue(_dest.exists());
- String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+ assertTrue(dest.exists());
+ String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))).replaceAll(
"\r\n", "\n").replace('\r', '\n');
String expected = readEntirely("test-write-full.xml").replaceAll("\r\n", "\n").replace(
'\r', '\n');
@@ -112,17 +112,17 @@ public class XmlModuleDescriptorWriterTe
}
public void setUp() {
- if (_dest.exists()) {
- _dest.delete();
+ if (dest.exists()) {
+ dest.delete();
}
- if (!_dest.getParentFile().exists()) {
- _dest.getParentFile().mkdirs();
+ if (!dest.getParentFile().exists()) {
+ dest.getParentFile().mkdirs();
}
}
protected void tearDown() throws Exception {
- if (_dest.exists()) {
- _dest.delete();
+ if (dest.exists()) {
+ dest.delete();
}
}
}