eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix TimeUnit.convert implementation

Browse Source 
See #329
This commit is contained in:
Alexey Andreev 2018-02-16 22:40:56 +03:00
parent 2055df55b3
commit 51d87091cc
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classlib/src/main/java/org/teavm/classlib/java/util/concurrent/TTimeUnit.java
View File

@ -34,9 +34,9 @@ public enum TTimeUnit {
long sourceNanos = sourceUnit.nanoseconds;
long targetNanos = nanoseconds;
if (sourceNanos < targetNanos) {
return sourceDuration * (targetNanos / sourceNanos);
return sourceDuration / (targetNanos / sourceNanos);
} else {
return sourceDuration / (sourceNanos / targetNanos);
return sourceDuration * (sourceNanos / targetNanos);
}
}

33
tests/src/test/java/org/teavm/classlib/java/util/concurrent/TimeUnitTest.java Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright 2018 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.util.concurrent;
import static org.junit.Assert.assertEquals;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.teavm.junit.TeaVMTestRunner;
@RunWith(TeaVMTestRunner.class)
public class TimeUnitTest {
@Test
public void convert() {
assertEquals(60, TimeUnit.MINUTES.toSeconds(1));
assertEquals(30000, TimeUnit.SECONDS.toMillis(30));
assertEquals(2, TimeUnit.DAYS.convert(48, TimeUnit.HOURS));
assertEquals(180, TimeUnit.MINUTES.convert(3, TimeUnit.HOURS));
}
}