From 00b297475c53b75f213adac4c8130755d6bba050 Mon Sep 17 00:00:00 2001 From: "Kristian S. Stangeland" Date: Tue, 19 Nov 2013 13:14:47 +0100 Subject: [PATCH] Switching to 1.6.4 in the unit tests. --- ProtocolLib/pom.xml | 2 +- .../com/comphenix/protocol/BukkitInitialization.java | 6 +++--- .../comphenix/protocol/events/PacketContainerTest.java | 9 +++++---- .../comphenix/protocol/utility/StreamSerializerTest.java | 4 ++-- .../protocol/wrappers/WrappedAttributeTest.java | 6 +++--- .../comphenix/protocol/wrappers/nbt/NbtFactoryTest.java | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ProtocolLib/pom.xml b/ProtocolLib/pom.xml index a6a150b8..1c69f4a4 100644 --- a/ProtocolLib/pom.xml +++ b/ProtocolLib/pom.xml @@ -231,7 +231,7 @@ org.bukkit craftbukkit - 1.6.2-R0.1-SNAPSHOT + 1.6.4-R2.0 provided diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java b/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java index 988ac692..5eb44bc5 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java @@ -4,10 +4,10 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.minecraft.server.v1_6_R2.StatisticList; +import net.minecraft.server.v1_6_R3.StatisticList; // Will have to be updated for every version though -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemFactory; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemFactory; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -63,6 +63,6 @@ public class BukkitInitialization { */ public static void initializePackage() { // Initialize reflection - MinecraftReflection.setMinecraftPackage("net.minecraft.server.v1_6_R2", "org.bukkit.craftbukkit.v1_6_R2"); + MinecraftReflection.setMinecraftPackage("net.minecraft.server.v1_6_R3", "org.bukkit.craftbukkit.v1_6_R3"); } } diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java index 40f54610..8a64f957 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java @@ -22,15 +22,15 @@ import java.lang.reflect.Array; import java.util.List; import java.util.UUID; -import net.minecraft.server.v1_6_R2.AttributeModifier; -import net.minecraft.server.v1_6_R2.AttributeSnapshot; -import net.minecraft.server.v1_6_R2.Packet44UpdateAttributes; +import net.minecraft.server.v1_6_R3.AttributeModifier; +import net.minecraft.server.v1_6_R3.AttributeSnapshot; +import net.minecraft.server.v1_6_R3.Packet44UpdateAttributes; import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; // Will have to be updated for every version though -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemFactory; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemFactory; import org.bukkit.Material; import org.bukkit.WorldType; @@ -348,6 +348,7 @@ public class PacketContainerTest { ToStringBuilder.reflectionToString(clonedSnapshot, ToStringStyle.SHORT_PREFIX_STYLE)); } + @SuppressWarnings("deprecation") @Test public void testPotionEffect() { PotionEffect effect = new PotionEffect(PotionEffectType.FIRE_RESISTANCE, 20 * 60, 1); diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java index 557334cf..f96be208 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java @@ -8,10 +8,10 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.server.v1_6_R2.IntHashMap; +import net.minecraft.server.v1_6_R3.IntHashMap; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemFactory; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemFactory; import org.bukkit.inventory.ItemStack; import org.junit.BeforeClass; import org.junit.Test; diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java index 5e704fa5..a5feaf3b 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.*; import java.util.List; -import net.minecraft.server.v1_6_R2.AttributeModifier; -import net.minecraft.server.v1_6_R2.AttributeSnapshot; -import net.minecraft.server.v1_6_R2.Packet44UpdateAttributes; +import net.minecraft.server.v1_6_R3.AttributeModifier; +import net.minecraft.server.v1_6_R3.AttributeSnapshot; +import net.minecraft.server.v1_6_R3.Packet44UpdateAttributes; import org.junit.Before; import org.junit.BeforeClass; diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java index bb413974..9d2e1a22 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java @@ -27,7 +27,7 @@ import java.io.DataOutput; import java.io.DataOutputStream; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemFactory; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemFactory; import org.bukkit.inventory.ItemStack; import org.junit.BeforeClass; import org.junit.Test;