aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/util/GT_OverclockCalculator.java8
-rw-r--r--src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java215
2 files changed, 52 insertions, 171 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
index 7e3be7e3b0..8003e21054 100644
--- a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
+++ b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java
@@ -250,9 +250,9 @@ public class GT_OverclockCalculator {
/**
* @return The consumtipn after overclock has been calculated
*/
- public long getConsumption() throws Exception {
+ public long getConsumption() {
if (!calculated) {
- throw new Exception("Tried to get consumption before calculating!");
+ calculate();
}
return mRecipeEUt;
}
@@ -260,9 +260,9 @@ public class GT_OverclockCalculator {
/**
* @return The duration of the recipe after overclock has been calculated
*/
- public int getDuration() throws Exception {
+ public int getDuration() {
if (!calculated) {
- throw new Exception("Tried to get duration before calculating!");
+ calculate();
}
return mDuration;
}
diff --git a/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java b/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java
index 54097d882f..91be53cf3f 100644
--- a/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java
+++ b/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java
@@ -3,7 +3,6 @@ package gregtech.overclock;
import static gregtech.api.enums.GT_Values.V;
import static gregtech.api.enums.GT_Values.VP;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
import gregtech.api.util.GT_OverclockCalculator;
import org.junit.jupiter.api.Test;
@@ -26,12 +25,8 @@ class GT_OverclockCalculator_UnitTest {
.setRecipeHeat(1800)
.setMultiHeat(1800 * 5)
.calculate();
- try {
- assertEquals(1024 >> 8, calculator.getDuration(), messageDuration);
- assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 8, calculator.getDuration(), messageDuration);
+ assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
}
@Test
@@ -47,12 +42,8 @@ class GT_OverclockCalculator_UnitTest {
.setRecipeHeat(1800)
.setMultiHeat(2700)
.calculate();
- try {
- assertEquals(1024 >> 4, calculator.getDuration(), messageDuration);
- assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 4, calculator.getDuration(), messageDuration);
+ assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
}
@Test
@@ -66,12 +57,8 @@ class GT_OverclockCalculator_UnitTest {
.setRecipeHeat(1800)
.setMultiHeat(1800)
.calculate();
- try {
- assertEquals(1024 >> 4, calculator.getDuration(), messageDuration);
- assertEquals(VP[5], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 4, calculator.getDuration(), messageDuration);
+ assertEquals(VP[5], calculator.getConsumption(), messageEUt);
}
@Test
@@ -87,12 +74,8 @@ class GT_OverclockCalculator_UnitTest {
.setRecipeHeat(1800)
.setMultiHeat(3600)
.calculate();
- try {
- assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
- assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
+ assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
}
@Test
@@ -102,12 +85,8 @@ class GT_OverclockCalculator_UnitTest {
.setEUt(V[6])
.setDuration(1024)
.calculate();
- try {
- assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
- assertEquals(VP[6], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6], calculator.getConsumption(), messageEUt);
}
@Test
@@ -118,12 +97,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(2048)
.enablePerfectOC()
.calculate();
- try {
- assertEquals(2048 >> 10, calculator.getDuration(), messageDuration);
- assertEquals(VP[6], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(2048 >> 10, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6], calculator.getConsumption(), messageEUt);
}
@Test
@@ -139,12 +114,8 @@ class GT_OverclockCalculator_UnitTest {
.setRecipeHeat(486)
.setMultiHeat(3900)
.calculate();
- try {
- assertEquals(2048 >> 6, calculator.getDuration(), messageDuration);
- assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(2048 >> 6, calculator.getDuration(), messageDuration);
+ assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
}
@Test
@@ -155,12 +126,8 @@ class GT_OverclockCalculator_UnitTest {
.setAmperage(2)
.setDuration(1024)
.calculate();
- try {
- assertEquals(1024 >> 6, calculator.getDuration(), messageDuration);
- assertEquals(VP[7], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 6, calculator.getDuration(), messageDuration);
+ assertEquals(VP[7], calculator.getConsumption(), messageEUt);
}
@Test
@@ -171,12 +138,8 @@ class GT_OverclockCalculator_UnitTest {
.setAmperage(256)
.setDuration(1024)
.calculate();
- try {
- assertEquals(1024 >> 9, calculator.getDuration(), messageDuration);
- assertEquals(VP[10], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 9, calculator.getDuration(), messageDuration);
+ assertEquals(VP[10], calculator.getConsumption(), messageEUt);
}
@Test
@@ -187,12 +150,8 @@ class GT_OverclockCalculator_UnitTest {
.setAmperage(320)
.setDuration(1024)
.calculate();
- try {
- assertEquals(1024 >> 9, calculator.getDuration(), messageDuration);
- assertEquals(VP[10], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 9, calculator.getDuration(), messageDuration);
+ assertEquals(VP[10], calculator.getConsumption(), messageEUt);
}
@Test
@@ -204,12 +163,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(1024)
.setParallel(16)
.calculate();
- try {
- assertEquals(1024 >> 6, calculator.getDuration(), messageDuration);
- assertEquals(VP[9], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 6, calculator.getDuration(), messageDuration);
+ assertEquals(VP[9], calculator.getConsumption(), messageEUt);
}
@Test
@@ -222,12 +177,8 @@ class GT_OverclockCalculator_UnitTest {
.setParallel(16)
.enablePerfectOC()
.calculate();
- try {
- assertEquals(4096 >> 12, calculator.getDuration(), messageDuration);
- assertEquals(VP[9], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(4096 >> 12, calculator.getDuration(), messageDuration);
+ assertEquals(VP[9], calculator.getConsumption(), messageEUt);
}
@Test
@@ -239,12 +190,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(1024)
.setParallel(16)
.calculate();
- try {
- assertEquals(1024 >> 7, calculator.getDuration(), messageDuration);
- assertEquals(VP[10], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 7, calculator.getDuration(), messageDuration);
+ assertEquals(VP[10], calculator.getConsumption(), messageEUt);
}
@Test
@@ -255,12 +202,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(1024)
.setParallel(8)
.calculate();
- try {
- assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
- assertEquals(VP[6] * 8, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6] * 8, calculator.getConsumption(), messageEUt);
}
@Test
@@ -272,12 +215,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(1024)
.setParallel(8)
.calculate();
- try {
- assertEquals(1024 >> 9, calculator.getDuration(), messageDuration);
- assertEquals(VP[6] * 8 * 256, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 9, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6] * 8 * 256, calculator.getConsumption(), messageEUt);
}
@Test
@@ -287,12 +226,8 @@ class GT_OverclockCalculator_UnitTest {
.setEUt(V[6])
.setDuration(77)
.calculate();
- try {
- assertEquals(77 >> 5, calculator.getDuration(), messageDuration);
- assertEquals(VP[6], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(77 >> 5, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6], calculator.getConsumption(), messageEUt);
}
@Test
@@ -302,12 +237,8 @@ class GT_OverclockCalculator_UnitTest {
.setEUt(V[6])
.setDuration(1)
.calculate();
- try {
- assertEquals(1, calculator.getDuration(), messageDuration);
- assertEquals(VP[1], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1, calculator.getDuration(), messageDuration);
+ assertEquals(VP[1], calculator.getConsumption(), messageEUt);
}
@Test
@@ -319,12 +250,8 @@ class GT_OverclockCalculator_UnitTest {
.setEUtDiscount(0.9f)
.setDuration(1024)
.calculate();
- try {
- assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
- assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 5, calculator.getDuration(), messageDuration);
+ assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
}
@Test
@@ -337,13 +264,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(1024)
.enablePerfectOC()
.calculate();
-
- try {
- assertEquals(1024 >> 10, calculator.getDuration(), messageDuration);
- assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1024 >> 10, calculator.getDuration(), messageDuration);
+ assertEquals(correctConsumption, calculator.getConsumption(), messageEUt);
}
@Test
@@ -354,12 +276,8 @@ class GT_OverclockCalculator_UnitTest {
.setSpeedBoost(0.9f)
.setDuration(1024)
.calculate();
- try {
- assertEquals((int) (1024 * 0.9f) >> 5, calculator.getDuration(), messageDuration);
- assertEquals(VP[6], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals((int) (1024 * 0.9f) >> 5, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6], calculator.getConsumption(), messageEUt);
}
@Test
@@ -371,12 +289,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(2048)
.enablePerfectOC()
.calculate();
- try {
- assertEquals((int) (2048 * 0.9f) >> 10, calculator.getDuration(), messageDuration);
- assertEquals(VP[6], calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals((int) (2048 * 0.9f) >> 10, calculator.getDuration(), messageDuration);
+ assertEquals(VP[6], calculator.getConsumption(), messageEUt);
}
@Test
@@ -387,12 +301,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(1)
.enableOneTickDiscount()
.calculate();
- try {
- assertEquals(1, calculator.getDuration(), messageDuration);
- assertEquals(1, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1, calculator.getDuration(), messageDuration);
+ assertEquals(1, calculator.getConsumption(), messageEUt);
}
@Test
@@ -404,12 +314,8 @@ class GT_OverclockCalculator_UnitTest {
.setDuration(4)
.enableOneTickDiscount()
.calculate();
- try {
- assertEquals(1, calculator.getDuration(), messageDuration);
- assertEquals(480 >> 3, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
+ assertEquals(1, calculator.getDuration(), messageDuration);
+ assertEquals(480 >> 3, calculator.getConsumption(), messageEUt);
}
@Test
@@ -422,32 +328,7 @@ class GT_OverclockCalculator_UnitTest {
.enablePerfectOC()
.enableOneTickDiscount()
.calculate();
- try {
- assertEquals(1, calculator.getDuration(), messageDuration);
- assertEquals(480 >> 6, calculator.getConsumption(), messageEUt);
- } catch (Exception e) {
- assert fail("There was an exception") != null;
- }
- }
-
- @Test
- void correctExceptionsWhenNotCalculating_Test() {
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(VP[1])
- .setEUt(V[6])
- .setSpeedBoost(1.1f)
- .setDuration(16);
- try {
- calculator.getDuration();
- assert fail("There wasn't exception") != null;
- } catch (Exception e) {
- assertEquals("Tried to get duration before calculating!", e.getMessage());
- }
- try {
- calculator.getConsumption();
- assert fail("There wasn't exception") != null;
- } catch (Exception e) {
- assertEquals("Tried to get consumption before calculating!", e.getMessage());
- }
+ assertEquals(1, calculator.getDuration(), messageDuration);
+ assertEquals(480 >> 6, calculator.getConsumption(), messageEUt);
}
}
generated by cgit (git 2.46.0) at 2025-03-05 20:14:09 +0000