diff --git a/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml b/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml deleted file mode 100644 index 6cdeb37a2..000000000 --- a/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java index 87d563770..ae6dbe215 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java @@ -11,6 +11,6 @@ public class Sql { } public static String varchar(int length) { - return "varchar("+length+")"; + return "varchar(" + length + ")"; } } diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java index 6889e0704..5930488a7 100644 --- a/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java +++ b/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java @@ -15,7 +15,7 @@ import test.java.utils.RandomData; import test.java.utils.TestInit; import java.io.IOException; -import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; @@ -28,7 +28,7 @@ import static junit.framework.TestCase.assertNotNull; @PrepareForTest(JavaPlugin.class) public class HastebinTest { - private AtomicBoolean hastebinAvailable = new AtomicBoolean(); + private AtomicReference testLink = new AtomicReference<>(null); @Before public void checkAvailability() throws Exception { @@ -40,27 +40,25 @@ public class HastebinTest { link = Hastebin.upload(RandomData.randomString(10)); } catch (IOException e) { if (e.getMessage().contains("503")) { - hastebinAvailable.set(false); return; } } catch (ParseException e) { /* Ignored */ } - if (link == null) { - hastebinAvailable.set(false); - } - - Log.info("Availability Test Link: " + link); + Log.info(link); + testLink.set(link); }); + thread.start(); + try { - thread.join(5000); + thread.join(); } catch (InterruptedException e) { - hastebinAvailable.set(false); + Log.info("InterruptedException: " + e.getMessage()); } - Log.info("Hastebin Available: " + hastebinAvailable.get()); + Log.info("Hastebin Availability Test Link: " + testLink.get()); } @Test @@ -75,7 +73,8 @@ public class HastebinTest { @Test public void testUpload() throws Exception { - if (!hastebinAvailable.get()) { + if (testLink.get() == null) { + Log.info("Hastebin not available, skipping testUpload()"); return; }