some more code embellishment

Author: Sascha Toennies

src/main/java/eu/toennies/javahttpobservatoryapi/Console.java

@@ -105,7 +105,7 @@ public static void main(String[] args) {
 				}
 			}
 		} catch (UnsupportedEncodingException e) {
-
+			System.err.println("Could not write to System.out using UTF-8 encoding.");
 		} finally {
 			if (pw != null) {
 				pw.close();

src/main/java/eu/toennies/javahttpobservatoryapi/HelpFormatter.java

@@ -306,7 +306,7 @@ private Appendable renderWrappedTextBlock(StringBuffer sb, int width, int nextLi
 	 *
 	 * @return the StringBuffer with the rendered Options contents.
 	 */
-	protected StringBuffer renderWrappedText(StringBuffer sb, int width, int nextLineTabStop, String text) {
+	protected StringBuffer renderWrappedText(StringBuffer sb, int width, final int nextLineTabStop, String text) {
 		int pos = findWrapPos(text, width, 0);
 
 		if (pos == -1) {
@@ -316,14 +316,17 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width, int nextLin
 		}
 		sb.append(rtrim(text.substring(0, pos))).append(getNewLine());
 
+		int currentNextLineTabStop;
 		if (nextLineTabStop >= width) {
 			// stops infinite loop happening
-			nextLineTabStop = 1;
+			currentNextLineTabStop = 1;
+		} else {
+			currentNextLineTabStop = nextLineTabStop;
 		}
 
 		// all following lines must be padded with nextLineTabStop space
 		// characters
-		final String padding = createPadding(nextLineTabStop);
+		final String padding = createPadding(currentNextLineTabStop);
 
 		while (true) {
 			text = padding + text.substring(pos).trim();
@@ -335,7 +338,7 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width, int nextLin
 				return sb;
 			}
 
-			if (text.length() > width && pos == nextLineTabStop - 1) {
+			if (text.length() > width && pos == currentNextLineTabStop - 1) {
 				pos = width;
 			}
 

src/main/java/eu/toennies/javahttpobservatoryapi/commands/InvokeAssessmentCommand.java

@@ -48,16 +48,18 @@ public JSONObject run(List<String> arguments) throws IllegalArgumentException {
 			throw new IllegalArgumentException("The mandatory argument host is not given.");
 		}
 
-		String host = ConsoleUtilities.listValueMatchRegex(arguments, "host=(.+)");
-
 		JSONObject json = null;
-		Api api = new Api();
-		Map<String, String> postParameters = new HashMap<String, String>();
-		postParameters.put("rescan", arguments.contains("rescan") ? "true" : "false");
-		postParameters.put("hidden", arguments.contains("hidden") ? "true" : "false");
-
 		try {
-			json = new JSONObject(api.sendApiPostRequest(getApiCommand() + "?host=" + host, postParameters));
+			Api api = new Api();
+			
+			Map<String, String> postParameters = new HashMap<String, String>();
+			postParameters.put("rescan", arguments.contains("rescan") ? "true" : "false");
+			postParameters.put("hidden", arguments.contains("hidden") ? "true" : "false");
+			
+			String host = ConsoleUtilities.listValueMatchRegex(arguments, "host=(.+)");
+			final String commandUrl = getApiCommand() + "?host=" + host;
+
+			json = new JSONObject(api.sendApiPostRequest(commandUrl, postParameters));
 			checkForError(json);
 		} catch (JSONException e) {
 			Logger.getGlobal().severe("Could not build result: " + e.getLocalizedMessage());

src/test/java/eu/toennies/javahttpobservatoryapi/ApiTest.java

@@ -44,7 +44,7 @@ public void init() {
 	public void testGradeDistributionCommand() {
 		GradeDistributionCommand cmd = new GradeDistributionCommand();
 		JSONObject gradeDistribution = cmd.run(null);
-		
+
 		assertNotNull("JSONObject is null", gradeDistribution);
 		ApiAssert.assertApiDataFetched(gradeDistribution);
 	}
@@ -70,24 +70,21 @@ public void testScannerStatesCommand() {
 	@Test
 	public void testInvokeAssessmentCommand() {
 		InvokeAssessmentCommand cmd = new InvokeAssessmentCommand();
-		
+
 		JSONObject assessment = new JSONObject();
 		try {
 			// Argument host is mandatory. Should fail
 			assessment = cmd.run(null);
-			fail("InvokeAssessmentCommand called without an host argument. This should not be possible.");
-		} catch(IllegalArgumentException e) {
-			//ignore
+			fail("Should have raised an IllegalArgumentException.");
+		} catch (IllegalArgumentException e) {
+			List<String> arguments = new ArrayList<String>();
+			arguments.add("host=google.com");
+			arguments.add("hidden");
+			assessment = cmd.run(arguments);
+
+			assertNotNull("JSONObject is null", assessment);
+			ApiAssert.assertApiDataFetched(assessment);
 		}
-		
-		
-		List<String> arguments = new ArrayList<String>();
-		arguments.add("host=google.com");
-		arguments.add("hidden");
-		assessment = cmd.run(arguments);
-
-		assertNotNull("JSONObject is null", assessment);
-		ApiAssert.assertApiDataFetched(assessment);
 	}
 
 	/**
@@ -110,12 +107,12 @@ public void testRetrieveTestResultsCommand() {
 		try {
 			// Argument id is mandatory. Should fail
 			cmd.run(null);
-		} catch(IllegalArgumentException e) {
-			assertTrue(true);
+			fail("Should have raised an IllegalArgumentException.");
+		} catch (IllegalArgumentException e) {
+			return;
 		}
 	}
 
-	
 	/**
 	 * A recent scan call should not be null.
 	 */
@@ -126,36 +123,38 @@ public void testRecentScansCommand() {
 		JSONObject json = cmd.run(null);
 		assertNotNull("JSONObject is null", json);
 		ApiAssert.assertApiDataFetched(json);
-		
+
 		// Test the min argument
 		List<String> arguments = new ArrayList<String>();
 		arguments.add("min=100");
 		json = cmd.run(arguments);
 		String key;
-		for(Iterator<String> it = json.keys(); it.hasNext();) {
+		for (Iterator<String> it = json.keys(); it.hasNext();) {
 			key = it.next();
 			try {
-				assertTrue("Calling recent scan with a minimum score of 100 should only retrieve A+ score", json.get(key).equals("A+"));
+				assertTrue("Calling recent scan with a minimum score of 100 should only retrieve A+ score",
+						json.get(key).equals("A+"));
 			} catch (JSONException e) {
-				e.printStackTrace();
+				fail();
 			}
 		}
-		
+
 		arguments.clear();
 		arguments.add("max=80");
 		json = cmd.run(arguments);
-		key = new String();
-		for(Iterator<String> it = json.keys(); it.hasNext();) {
+		for (Iterator<String> it = json.keys(); it.hasNext();) {
 			try {
 				key = it.next();
-				assertFalse("Calling recent scan with a maximum score of 80 should only retrieve A scores", json.get(key).equals("A-"));
-				assertFalse("Calling recent scan with a maximum score of 80 should only retrieve A scores", json.get(key).equals("A"));
-				assertFalse("Calling recent scan with a maximum score of 80 should only retrieve A scores", json.get(key).equals("A+"));
+				assertFalse("Calling recent scan with a maximum score of 80 should only retrieve A scores",
+						json.get(key).equals("A-"));
+				assertFalse("Calling recent scan with a maximum score of 80 should only retrieve A scores",
+						json.get(key).equals("A"));
+				assertFalse("Calling recent scan with a maximum score of 80 should only retrieve A scores",
+						json.get(key).equals("A+"));
 			} catch (JSONException e) {
 				e.printStackTrace();
 			}
 		}
-		
 
 	}
 }