Skip to content

Commit fb0a1af

Browse files
committed
Fix failing unit tests
1 parent 42a80d2 commit fb0a1af

File tree

2 files changed

+93
-5
lines changed

2 files changed

+93
-5
lines changed
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
package org.cyclops.integratedscripting.evaluate.translation;
2+
3+
import net.minecraft.world.item.CreativeModeTab;
4+
import net.minecraft.world.item.ItemStack;
5+
import org.apache.commons.lang3.tuple.Pair;
6+
import org.cyclops.cyclopscore.config.ConfigHandlerCommon;
7+
import org.cyclops.cyclopscore.helper.IModHelpers;
8+
import org.cyclops.cyclopscore.helper.LoggerHelper;
9+
import org.cyclops.cyclopscore.helper.ModHelpersNeoForge;
10+
import org.cyclops.cyclopscore.init.IModBase;
11+
import org.cyclops.cyclopscore.init.RegistryManager;
12+
import org.cyclops.cyclopscore.modcompat.ModCompatLoader;
13+
import org.cyclops.cyclopscore.network.IPacketHandler;
14+
import org.cyclops.cyclopscore.proxy.ICommonProxyCommon;
15+
import org.jetbrains.annotations.Nullable;
16+
17+
import java.util.List;
18+
19+
/**
20+
* @author rubensworks
21+
*/
22+
public class ModBaseMocked implements IModBase {
23+
@Override
24+
public String getModId() {
25+
return "";
26+
}
27+
28+
@Override
29+
public IModHelpers getModHelpers() {
30+
return ModHelpersNeoForge.INSTANCE;
31+
}
32+
33+
@Override
34+
public IPacketHandler getPacketHandler() {
35+
return null;
36+
}
37+
38+
@Override
39+
public ConfigHandlerCommon getConfigHandler() {
40+
return null;
41+
}
42+
43+
@Override
44+
public LoggerHelper getLoggerHelper() {
45+
return null;
46+
}
47+
48+
@Override
49+
public RegistryManager getRegistryManager() {
50+
return null;
51+
}
52+
53+
@Override
54+
public ICommonProxyCommon getProxy() {
55+
return null;
56+
}
57+
58+
@Override
59+
public ModCompatLoader getModCompatLoader() {
60+
return null;
61+
}
62+
63+
@Nullable
64+
@Override
65+
public CreativeModeTab getDefaultCreativeTab() {
66+
return null;
67+
}
68+
69+
@Override
70+
public void registerDefaultCreativeTabEntry(ItemStack itemStack, CreativeModeTab.TabVisibility visibility) {
71+
72+
}
73+
74+
@Override
75+
public List<Pair<ItemStack, CreativeModeTab.TabVisibility>> getDefaultCreativeTabEntries() {
76+
return List.of();
77+
}
78+
}

src/test/java/org/cyclops/integratedscripting/evaluate/translation/ValueTranslatorsJavaScriptTests.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.cyclops.integratedscripting.evaluate.translation;
22

3+
import com.google.common.collect.Maps;
34
import com.google.common.collect.Sets;
5+
import net.minecraft.SharedConstants;
46
import net.minecraft.nbt.*;
57
import net.minecraft.network.chat.MutableComponent;
68
import net.minecraft.resources.ResourceLocation;
@@ -9,7 +11,11 @@
911
import net.minecraft.world.item.Items;
1012
import net.minecraft.world.level.block.Blocks;
1113
import net.minecraft.world.level.material.Fluids;
14+
import net.neoforged.fml.loading.LoadingModList;
1215
import net.neoforged.neoforge.fluids.FluidStack;
16+
import org.cyclops.commoncapabilities.api.capability.itemhandler.ItemMatch;
17+
import org.cyclops.commoncapabilities.ingredient.DataComparator;
18+
import org.cyclops.cyclopscore.helper.CyclopsCoreInstance;
1319
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
1420
import org.cyclops.integrateddynamics.api.evaluate.operator.IOperator;
1521
import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
@@ -28,6 +34,7 @@
2834
import org.junit.Test;
2935

3036
import java.io.IOException;
37+
import java.util.Collections;
3138
import java.util.Iterator;
3239

3340
import static org.hamcrest.CoreMatchers.equalTo;
@@ -39,16 +46,19 @@
3946
*/
4047
public class ValueTranslatorsJavaScriptTests {
4148

42-
static {
43-
Bootstrap.bootStrap();
44-
}
45-
4649
private static ValueDeseralizationContext VDC = null;
4750
private static Context CTX = null;
4851
private static IEvaluationExceptionFactory EF = ScriptHelpers.getDummyEvaluationExceptionFactory();
4952

5053
@BeforeClass
5154
public static void beforeAll() {
55+
CyclopsCoreInstance.MOD = new ModBaseMocked();
56+
// Derived from NeoForge's JUnitMain
57+
SharedConstants.tryDetectVersion();
58+
LoadingModList.of(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Maps.newHashMap());
59+
Bootstrap.bootStrap();
60+
ItemMatch.DATA_COMPARATOR = new DataComparator(null);
61+
5262
ValueTypeListProxyFactories.load();
5363
Operators.load();
5464
ValueTranslators.load();
@@ -470,7 +480,7 @@ public void testObjectItemBidirectional() throws EvaluationException {
470480

471481
@Test
472482
public void testObjectItemMethods() throws EvaluationException {
473-
assertThat(ValueTranslators.REGISTRY.translateToGraal(CTX, ValueObjectTypeItemStack.ValueItemStack.of(new ItemStack(Items.ARROW)), EF, VDC).invokeMember("canBurn").asBoolean(), is(false));
483+
assertThat(ValueTranslators.REGISTRY.translateToGraal(CTX, ValueObjectTypeItemStack.ValueItemStack.of(new ItemStack(Items.ARROW)), EF, VDC).invokeMember("isEnchanted").asBoolean(), is(false));
474484

475485
assertThat(ValueTranslators.REGISTRY.translateToGraal(CTX, ValueObjectTypeItemStack.ValueItemStack.of(new ItemStack(Items.ACACIA_SAPLING)), EF, VDC).invokeMember("block").invokeMember("plantAge").asInt(), is(0));
476486

0 commit comments

Comments
 (0)