You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/10/12 22:19:13 UTC
svn commit: r463411 - in
/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java:
org/apache/harmony/luni/tests/java/io/ tests/api/java/io/
tests/api/java/net/ tests/api/java/util/
Author: hindessm
Date: Thu Oct 12 13:19:11 2006
New Revision: 463411
URL: http://svn.apache.org/viewvc?view=rev&rev=463411
Log:
Fix order of assertEquals arguments.
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CalendarTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java Thu Oct 12 13:19:11 2006
@@ -68,7 +68,7 @@
// ok
}
String result = in.getEncoding();
- assertEquals(result, "UnicodeBigUnmarked");
+ assertEquals("UnicodeBigUnmarked", result);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java Thu Oct 12 13:19:11 2006
@@ -50,7 +50,7 @@
// ok
}
String result = out.getEncoding();
- assertEquals(result, "UnicodeBigUnmarked");
+ assertEquals("UnicodeBigUnmarked", result);
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java Thu Oct 12 13:19:11 2006
@@ -233,7 +233,7 @@
fos.flush();
fos.close();
FileOutputStream f = new FileOutputStream(tmpfile, true);
- assertEquals(f.getChannel().position(), 10);
+ assertEquals(10, f.getChannel().position());
}
/**
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/HttpURLConnectionTest.java Thu Oct 12 13:19:11 2006
@@ -127,7 +127,7 @@
List newHeader = (List) headers.get("whatever");
assertNotNull(newHeader);
- assertEquals(newHeader.get(0), "you like");
+ assertEquals("you like", newHeader.get(0));
try {
// the map should be unmodifiable
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLConnectionTest.java Thu Oct 12 13:19:11 2006
@@ -363,7 +363,7 @@
List header = (List) headers.get("whatever");
assertNotNull(header);
- assertEquals(header.get(0), "you like");
+ assertEquals("you like", header.get(0));
assertTrue(headers.size() >= 1);
@@ -968,7 +968,7 @@
URLConnection uc = new URL("http://localhost").openConnection();
assertEquals(0, uc.getConnectTimeout());
uc.setConnectTimeout(0);
- assertEquals(uc.getConnectTimeout(),0);
+ assertEquals(0, uc.getConnectTimeout());
try{
uc.setConnectTimeout(-100);
fail("should throw IllegalArgumentException");
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CalendarTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CalendarTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CalendarTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CalendarTest.java Thu Oct 12 13:19:11 2006
@@ -450,7 +450,7 @@
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
- assertEquals(cal.getTimeInMillis(), 6017546357372606464L);
+ assertEquals(6017546357372606464L, cal.getTimeInMillis());
}
protected void setUp() {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java Thu Oct 12 13:19:11 2006
@@ -42,7 +42,7 @@
al.add(three);
al.add(four);
List sub = al.subList(1, 3);
- assertEquals(sub.size(), 2);
+ assertEquals(2, sub.size());
// the sub.get(1) is 3.0
assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0);
assertTrue(((Double) sub.get(1)).doubleValue() > 2.0);
@@ -72,7 +72,7 @@
al.add(three);
al.add(four);
List sub = al.subList(1, 3);
- assertEquals(sub.size(), 2);
+ assertEquals(2, sub.size());
// the sub.get(1) is 3.0
assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0);
assertTrue(((Double) sub.get(1)).doubleValue() > 2.0);
@@ -102,7 +102,7 @@
al.add(three);
al.add(four);
List sub = al.subList(1, 3);
- assertEquals(sub.size(), 2);
+ assertEquals(2, sub.size());
// the sub.get(1) is 3.0
assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0);
assertTrue(((Double) sub.get(1)).doubleValue() > 2.0);
@@ -132,7 +132,7 @@
al.add(three);
al.add(four);
List sub = al.subList(1, 3);
- assertEquals(sub.size(), 2);
+ assertEquals(2, sub.size());
// the sub.get(1) is 3.0
assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0);
assertTrue(((Double) sub.get(1)).doubleValue() > 2.0);
@@ -162,7 +162,7 @@
al.add(three);
al.add(four);
List sub = al.subList(1, 3);
- assertEquals(sub.size(), 2);
+ assertEquals(2, sub.size());
// the sub.get(1) is 3.0
assertTrue(((Double) sub.get(1)).doubleValue() <= 3.0);
assertTrue(((Double) sub.get(1)).doubleValue() > 2.0);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/CurrencyTest.java Thu Oct 12 13:19:11 2006
@@ -139,9 +139,9 @@
// one with Korean country but an India language
// this method should return the currency codes in that case
Locale.setDefault(new Locale("kr", "KR"));
- assertEquals("currK.getSymbol()", currK.getSymbol(), "KRW");
- assertEquals("currI.getSymbol()", currI.getSymbol(), "INR");
- assertEquals("currUS.getSymbol()", currUS.getSymbol(), "USD");
+ assertEquals("currK.getSymbol()", "KRW", currK.getSymbol());
+ assertEquals("currI.getSymbol()", "INR", currI.getSymbol());
+ assertEquals("currUS.getSymbol()", "USD", currUS.getSymbol());
}
/**
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTest.java?view=diff&rev=463411&r1=463410&r2=463411
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/TimerTest.java Thu Oct 12 13:19:11 2006
@@ -294,7 +294,7 @@
Timer t = null;
try {
t = new Timer();
- assertEquals(t.purge(), 0);
+ assertEquals(0, t.purge());
TimerTestTask[] tasks = new TimerTestTask[100];
int[] delayTime = { 50, 80, 20, 70, 40, 10, 90, 30, 60 };
@@ -313,7 +313,7 @@
}
assertTrue(t.purge() <= 50);
- assertEquals(t.purge(), 0);
+ assertEquals(0, t.purge());
} finally {
if (t != null) {
t.cancel();