Author: gscokart
Date: Mon Nov 5 11:35:30 2007
New Revision: 592128
URL: http://svn.apache.org/viewvc?rev=592128&view=rev
Log:
clean some eclipse warning
Modified:
incubator/ivy/core/trunk/test/buildlist/A/build.xml
incubator/ivy/core/trunk/test/buildlist/B/build.xml
incubator/ivy/core/trunk/test/buildlist/C/build.xml
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java
Modified: incubator/ivy/core/trunk/test/buildlist/A/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/buildlist/A/build.xml?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
--- incubator/ivy/core/trunk/test/buildlist/A/build.xml (original)
+++ incubator/ivy/core/trunk/test/buildlist/A/build.xml Mon Nov 5 11:35:30 2007
@@ -16,3 +16,4 @@
specific language governing permissions and limitations
under the License.
-->
+<project/>
\ No newline at end of file
Modified: incubator/ivy/core/trunk/test/buildlist/B/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/buildlist/B/build.xml?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
--- incubator/ivy/core/trunk/test/buildlist/B/build.xml (original)
+++ incubator/ivy/core/trunk/test/buildlist/B/build.xml Mon Nov 5 11:35:30 2007
@@ -16,3 +16,4 @@
specific language governing permissions and limitations
under the License.
-->
+<project/>
\ No newline at end of file
Modified: incubator/ivy/core/trunk/test/buildlist/C/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/buildlist/C/build.xml?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
--- incubator/ivy/core/trunk/test/buildlist/C/build.xml (original)
+++ incubator/ivy/core/trunk/test/buildlist/C/build.xml Mon Nov 5 11:35:30 2007
@@ -16,3 +16,4 @@
specific language governing permissions and limitations
under the License.
-->
+<project/>
\ No newline at end of file
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConfigureTest.java
Mon Nov 5 11:35:30 2007
@@ -100,6 +100,7 @@
assertEquals("myvalue", settings.getVariables().get("myproperty"));
}
+ /[EMAIL PROTECTED]/
public void testURL() throws Exception {
String confUrl = new
File("test/repositories/ivysettings.xml").toURL().toExternalForm();
String confDirUrl = new
File("test/repositories").toURL().toExternalForm();
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConvertPomTest.java?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyConvertPomTest.java
Mon Nov 5 11:35:30 2007
@@ -17,15 +17,10 @@
*/
package org.apache.ivy.ant;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import junit.framework.TestCase;
-import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.Project;
public class IvyConvertPomTest extends TestCase {
@@ -38,16 +33,19 @@
task.setIvyFile(destFile);
task.execute();
- String wrote = FileUtil.readEntirely(new BufferedReader(new
FileReader(destFile)));
- String expected =
readEntirely("test-convertpom.xml").replaceAll("\r\n", "\n").replace(
- '\r', '\n');
- // do not work properly on all platform and depends on the file date
- // assertEquals(expected, wrote);
+ //do not work properly on all platform and depends on the file date
+ //keep the code in comments in case someone manage to fix this and to
highlight the fact
+ //that this is not checked
+
+// String wrote = FileUtil.readEntirely(new BufferedReader(new
FileReader(destFile)));
+// String expected =
readEntirely("test-convertpom.xml").replaceAll("\r\n", "\n").replace(
+// '\r', '\n');
+// assertEquals(expected, wrote);
}
- private String readEntirely(String resource) throws IOException {
- return FileUtil.readEntirely(
- new BufferedReader(new
InputStreamReader(IvyConvertPomTest.class.getResource(resource)
- .openStream()))).replaceAll("\r\n", "\n").replace('\r',
'\n');
- }
+// private String readEntirely(String resource) throws IOException {
+// return FileUtil.readEntirely(
+// new BufferedReader(new
InputStreamReader(IvyConvertPomTest.class.getResource(resource)
+// .openStream()))).replaceAll("\r\n", "\n").replace('\r',
'\n');
+// }
}
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
Mon Nov 5 11:35:30 2007
@@ -65,7 +65,7 @@
public void testNullExpression() {
try {
- Matcher matcher = patternMatcher.getMatcher(null);
+ patternMatcher.getMatcher(null);
fail("Should fail for null expression");
} catch (NullPointerException expected) {
@@ -80,7 +80,7 @@
"this is an expression", "whatever this is", "maybe, maybe
not"};
for (int i = 0; i < 100000; i++) {
String input = inputs[i % inputs.length];
- boolean success = matcher.matches(input);
+ matcher.matches(input);
}
}
@@ -90,7 +90,7 @@
for (int i = 0; i < 100000; i++) {
String expression = inputs[i % inputs.length];
- Matcher matcher = patternMatcher.getMatcher(expression);
+ patternMatcher.getMatcher(expression);
}
}
}
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java?rev=592128&r1=592127&r2=592128&view=diff
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java
Mon Nov 5 11:35:30 2007
@@ -71,7 +71,7 @@
public void testInvalidSyntax() {
try {
- Matcher matcher = patternMatcher.getMatcher("[");
+ patternMatcher.getMatcher("[");
fail("Should fail on invalid regexp syntax");
} catch (PatternSyntaxException e) {
