Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-17 15:55:02 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #259 from Fuzzlemann/master

Browse Source 
PR for 3.6.4 (Fuzzlemann) (4)
This commit is contained in:
Rsl1122 2017-08-18 11:25:37 +03:00 committed by GitHub
commit 541eab13c0
5 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.djrapitops:PlanPluginBridge:3.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/PlanPluginBridge/3.6.0/PlanPluginBridge-3.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/PlanPluginBridge/3.6.0/PlanPluginBridge-3.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/PlanPluginBridge/3.6.0/PlanPluginBridge-3.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>

2
Plan/src/main/java/com/djrapitops/plan/database/sql/Sql.java
View File

@ -11,6 +11,6 @@ public class Sql {
}
public static String varchar(int length) {
return "varchar("+length+")";
return "varchar(" + length + ")";
}
}

14
Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java
View File

@ -17,7 +17,7 @@ public class DumpLog {
*
* @param header The name of the header
*/
void addHeader(String header) {
public void addHeader(String header) {
addLine("");
addLine("--- " + header + " ---");
}
@ -28,7 +28,7 @@ public class DumpLog {
* @param key The key
* @param value The value
*/
void add(String key, String value) {
public void add(String key, String value) {
addLine(key + ": " + value);
}
@ -38,7 +38,7 @@ public class DumpLog {
* @param key The key
* @param value The value
*/
void add(String key, boolean value) {
public void add(String key, boolean value) {
addLine(key + ": " + value);
}
@ -49,7 +49,7 @@ public class DumpLog {
* @param key The key
* @param value The CharSequences stored in an Iterable
*/
void add(String key, Iterable<? extends CharSequence> value) {
public void add(String key, Iterable<? extends CharSequence> value) {
addLine(key + ": " + String.join(", ", value));
}
@ -58,7 +58,7 @@ public class DumpLog {
*
* @param lines The CharSequences stored in an Iterable
*/
void addLines(Iterable<? extends CharSequence> lines) {
public void addLines(Iterable<? extends CharSequence> lines) {
lines.forEach(this::addLine);
}
@ -67,7 +67,7 @@ public class DumpLog {
*
* @param lines The lines
*/
void addLines(CharSequence... lines) {
public void addLines(CharSequence... lines) {
Arrays.stream(lines).forEach(this::addLine);
}
@ -76,7 +76,7 @@ public class DumpLog {
*
* @param line The content of the line
*/
private void addLine(CharSequence line) {
public void addLine(CharSequence line) {
lines.add(line == null ? "\n" : line.toString());
}

41
Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/DumpLogTest.java Normal file
View File

@ -0,0 +1,41 @@
package test.java.main.java.com.djrapitops.plan.utilities.dump;
import main.java.com.djrapitops.plan.utilities.file.dump.DumpLog;
import org.junit.Test;
import java.util.Arrays;
import static junit.framework.TestCase.assertEquals;
/**
* @author Fuzzlemann
*/
public class DumpLogTest {
@Test
public void testDumpLogCreation() {
DumpLog testLog = new DumpLog();
testLog.addHeader("Test Header");
testLog.add("StringValue", "Test");
testLog.add("BooleanValue", true);
testLog.add("IterableValue", Arrays.asList("Iterable 1", "Iterable 2"));
testLog.addLine(new StringBuilder("CharSequence Test"));
testLog.addLines(new StringBuilder("CharSequences Test"), new StringBuilder("CharSequences Test"));
testLog.addLines(Arrays.asList("Iterable 1", "Iterable 2"));
String expResult = "\n--- Test Header ---\n" +
"StringValue: Test\n" +
"BooleanValue: true\n" +
"IterableValue: Iterable 1, Iterable 2\n" +
"CharSequence Test\n" +
"CharSequences Test\n" +
"CharSequences Test\n" +
"Iterable 1\n" +
"Iterable 2";
String result = testLog.toString();
assertEquals(expResult, result);
}
}

21
Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java
View File

@ -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<String> 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);
} catch (InterruptedException e) {
hastebinAvailable.set(false);
Log.info("Hastebin timed out");
}
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;
}