Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alexey Andreev 2015-05-14 13:53:58 +04:00
commit f07a8aec8f
5 changed files with 19 additions and 3 deletions

View File

@ -115,7 +115,7 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
} else {
insertSpace(target, target + 1);
}
buffer[target++] = (char)('0' + value);
buffer[target++] = TCharacter.forDigit(value, radix);
} else {
int pos = 1;
int sz = 1;

View File

@ -93,11 +93,11 @@ public final class TMath extends TObject {
public static native double atan2(double y, double x);
public static int round(float a) {
return (int)(a + 0.5f);
return (int)(a + signum(a) * 0.5f);
}
public static long round(double a) {
return (long)(a + 0.5);
return (long)(a + signum(a) * 0.5);
}
@GeneratedBy(MathNativeGenerator.class)

View File

@ -253,6 +253,9 @@ public class TCollections extends TObject {
}
int l = 0;
int u = list.size() - 1;
if (u < 0) {
return -1;
}
while (true) {
int i = (l + u) / 2;
T e = list.get(i);

View File

@ -58,6 +58,11 @@ public class IntegerTest {
assertEquals("kona", Integer.toString(411787, 27));
}
@Test
public void writesSingleDigitInteger() {
assertEquals("a", Integer.toString(10, 16));
}
@Test
public void decodes() {
assertEquals(Integer.valueOf(123), Integer.decode("123"));

View File

@ -54,4 +54,12 @@ public class MathTest {
public void getExponentComputed() {
assertEquals(6, Math.getExponent(123.456));
}
@Test
public void roundWorks() {
assertEquals(1, Math.round(1.3));
assertEquals(2, Math.round(1.8));
assertEquals(-1, Math.round(-1.3));
assertEquals(-2, Math.round(-1.8));
}
}