Index: trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 9480)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 9488)
@@ -7,4 +7,5 @@
import java.net.HttpURLConnection;
import java.net.SocketException;
+import java.net.URL;
import java.net.UnknownHostException;
@@ -16,4 +17,5 @@
import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
import org.openstreetmap.josm.io.OfflineAccessException;
+import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiException;
import org.openstreetmap.josm.io.OsmApiInitializationException;
@@ -26,5 +28,6 @@
public class ExceptionUtilTest {
- private static String url;
+ private static String baseUrl;
+ private static String serverUrl;
private static String host;
private static String user;
@@ -32,10 +35,14 @@
/**
* Setup test.
+ * @throws Exception in case of error
*/
@BeforeClass
- public static void setUp() {
+ public static void setUp() throws Exception {
JOSMFixture.createUnitTestFixture().init();
- url = new OsmApiException("").getUrl();
- host = url.replace("http://", "").replace("/api/", "").replace("0.6/", "");
+ OsmApi api = OsmApi.getOsmApi();
+ api.initialize(null);
+ baseUrl = api.getBaseUrl();
+ serverUrl = api.getServerUrl();
+ host = new URL(serverUrl).getHost();
user = CredentialsManager.getInstance().getUsername();
}
@@ -46,12 +53,12 @@
@Test
public void testExplainBadRequest() {
- assertEquals("The OSM server '"+url+"' reported a bad request.
",
+ assertEquals("The OSM server '"+baseUrl+"' reported a bad request.
",
ExceptionUtil.explainBadRequest(new OsmApiException("")));
- assertEquals("The OSM server '"+url+"' reported a bad request.
"+
+ assertEquals("The OSM server '"+baseUrl+"' reported a bad request.
"+
"Error message(untranslated): header",
ExceptionUtil.explainBadRequest(new OsmApiException(HttpURLConnection.HTTP_BAD_REQUEST, "header", "")));
- assertEquals("The OSM server '"+url+"' reported a bad request.
"+
+ assertEquals("The OSM server '"+baseUrl+"' reported a bad request.
"+
"Error message(untranslated): header",
ExceptionUtil.explainBadRequest(new OsmApiException(HttpURLConnection.HTTP_BAD_REQUEST, "header", "", "invalid_url")));
@@ -59,12 +66,12 @@
assertEquals("The OSM server '"+host+"' reported a bad request.
"+
"Error message(untranslated): header",
- ExceptionUtil.explainBadRequest(new OsmApiException(HttpURLConnection.HTTP_BAD_REQUEST, "header", "", url)));
-
- assertEquals("The OSM server '"+url+"' reported a bad request.
"+
+ ExceptionUtil.explainBadRequest(new OsmApiException(HttpURLConnection.HTTP_BAD_REQUEST, "header", "", baseUrl)));
+
+ assertEquals("The OSM server '"+baseUrl+"' reported a bad request.
"+
"The area you tried to download is too big or your request was too large.
"+
"Either request a smaller area or use an export file provided by the OSM community.",
ExceptionUtil.explainBadRequest(new OsmApiException(HttpURLConnection.HTTP_BAD_REQUEST, "The maximum bbox", "")));
- assertEquals("The OSM server '"+url+"' reported a bad request.
"+
+ assertEquals("The OSM server '"+baseUrl+"' reported a bad request.
"+
"The area you tried to download is too big or your request was too large.
"+
"Either request a smaller area or use an export file provided by the OSM community.",
@@ -77,5 +84,5 @@
@Test
public void testExplainBandwidthLimitExceeded() {
- assertEquals("Communication with the OSM server '"+url+"'failed. "+
+ assertEquals("Communication with the OSM server '"+baseUrl+"'failed. "+
"The server replied
the following error code and the following error message:
"+
"Error code: 0
Error message (untranslated): no error message available",
@@ -100,5 +107,5 @@
@Test
public void testExplainClientTimeout() {
- assertEquals("Communication with the OSM server '"+url+"' timed out. Please retry later.",
+ assertEquals("Communication with the OSM server '"+baseUrl+"' timed out. Please retry later.",
ExceptionUtil.explainClientTimeout(new OsmApiException("")));
}
@@ -160,7 +167,7 @@
ExceptionUtil.explainFailedOAuthAuthorisation(new OsmApiException("")));
assertEquals("Authorisation at the OSM server with the OAuth token 'null' failed.
"+
- "The token is not authorised to access the protected resource
'"+url+"'.
"+
+ "The token is not authorised to access the protected resource
'"+baseUrl+"'.
"+
"Please launch the preferences dialog and retrieve another OAuth token.",
- ExceptionUtil.explainFailedOAuthAuthorisation(new OsmApiException(HttpURLConnection.HTTP_FORBIDDEN, "", "", url)));
+ ExceptionUtil.explainFailedOAuthAuthorisation(new OsmApiException(HttpURLConnection.HTTP_FORBIDDEN, "", "", baseUrl)));
}
@@ -190,15 +197,15 @@
@Test
public void testExplainGenericOsmApiException() {
- assertEquals("Communication with the OSM server '"+url+"'failed. The server replied
"+
+ assertEquals("Communication with the OSM server '"+baseUrl+"'failed. The server replied
"+
"the following error code and the following error message:
Error code: 0
"+
"Error message (untranslated): no error message available",
ExceptionUtil.explainGenericOsmApiException(new OsmApiException("")));
- assertEquals("Communication with the OSM server '"+url+"'failed. The server replied
"+
+ assertEquals("Communication with the OSM server '"+baseUrl+"'failed. The server replied
"+
"the following error code and the following error message:
Error code: 500
"+
"Error message (untranslated): header",
ExceptionUtil.explainGenericOsmApiException(new OsmApiException(HttpURLConnection.HTTP_INTERNAL_ERROR, "header", null)));
- assertEquals("Communication with the OSM server '"+url+"'failed. The server replied
"+
+ assertEquals("Communication with the OSM server '"+baseUrl+"'failed. The server replied
"+
"the following error code and the following error message:
Error code: 500
"+
"Error message (untranslated): body",
@@ -223,5 +230,5 @@
@Test
public void testExplainInternalServerError() {
- assertEquals("The OSM server
'"+url+"'
reported an internal server error.
"+
+ assertEquals("The OSM server
'"+baseUrl+"'
reported an internal server error.
"+
"This is most likely a temporary problem. Please try again later.",
ExceptionUtil.explainInternalServerError(new OsmApiException("")));
@@ -258,9 +265,9 @@
@Test
public void testExplainNestedIOException() {
- assertEquals("Failed to upload data to or download data from
'"+url+"'
"+
+ assertEquals("Failed to upload data to or download data from
'"+baseUrl+"'
"+
"due to a problem with transferring data.
Details (untranslated): null",
ExceptionUtil.explainNestedIOException(new OsmApiException("")));
- assertEquals("Failed to upload data to or download data from
'"+url+"'
"+
+ assertEquals("Failed to upload data to or download data from
'"+baseUrl+"'
"+
"due to a problem with transferring data.
Details (untranslated): test",
ExceptionUtil.explainNestedIOException(new OsmApiException(new IOException("test"))));
@@ -272,5 +279,5 @@
@Test
public void testExplainNestedSocketException() {
- assertEquals("Failed to open a connection to the remote server
'"+url+"'.
"+
+ assertEquals("Failed to open a connection to the remote server
'"+baseUrl+"'.
"+
"Please check your internet connection.",
ExceptionUtil.explainNestedSocketException(new OsmApiException("")));
@@ -282,5 +289,5 @@
@Test
public void testExplainNestedUnknownHostException() {
- assertEquals("Failed to open a connection to the remote server
'"+url+"'.
"+
+ assertEquals("Failed to open a connection to the remote server
'"+baseUrl+"'.
"+
"Host name '"+host+"' could not be resolved.
"+
"Please check the API URL in your preferences and your internet connection.",
@@ -293,8 +300,8 @@
@Test
public void testExplainNotFound() {
- assertEquals("The OSM server '"+url+"' does not know about an object
"+
+ assertEquals("The OSM server '"+baseUrl+"' does not know about an object
"+
"you tried to read, update, or delete. Either the respective object
"+
"does not exist on the server or you are using an invalid URL to access
"+
- "it. Please carefully check the server's address '"+url+"' for typos.",
+ "it. Please carefully check the server's address '"+baseUrl+"' for typos.",
ExceptionUtil.explainNotFound(new OsmApiException("")));
}
@@ -316,5 +323,5 @@
@Test
public void testExplainOsmApiInitializationException() {
- assertEquals("Failed to initialize communication with the OSM server "+url.substring(0, url.length()-1)+".
"+
+ assertEquals("Failed to initialize communication with the OSM server "+serverUrl+".
"+
"Check the server URL in your preferences and your internet connection.",
ExceptionUtil.explainOsmApiInitializationException(new OsmApiInitializationException("")));
@@ -326,23 +333,23 @@
@Test
public void testExplainOsmTransferException() {
- assertEquals("Failed to open a connection to the remote server
'"+url+"'
"+
+ assertEquals("Failed to open a connection to the remote server
'"+baseUrl+"'
"+
"for security reasons. This is most likely because you are running
"+
"in an applet and because you did not load your applet from '"+host+"'.",
ExceptionUtil.explainOsmTransferException(new OsmApiException(new SecurityException("test"))));
- assertEquals("Failed to open a connection to the remote server
'"+url+"'.
"+
+ assertEquals("Failed to open a connection to the remote server
'"+baseUrl+"'.
"+
"Please check your internet connection.",
ExceptionUtil.explainOsmTransferException(new OsmApiException(new SocketException("test"))));
- assertEquals("Failed to open a connection to the remote server
'"+url+"'.
"+
+ assertEquals("Failed to open a connection to the remote server
'"+baseUrl+"'.
"+
"Host name '"+host+"' could not be resolved.
"+
"Please check the API URL in your preferences and your internet connection.",
ExceptionUtil.explainOsmTransferException(new OsmApiException(new UnknownHostException("test"))));
- assertEquals("Failed to upload data to or download data from
'"+url+"'
"+
+ assertEquals("Failed to upload data to or download data from
'"+baseUrl+"'
"+
"due to a problem with transferring data.
Details (untranslated): test",
ExceptionUtil.explainOsmTransferException(new OsmApiException(new IOException("test"))));
- assertEquals("Failed to initialize communication with the OSM server "+url.substring(0, url.length()-1)+".
"+
+ assertEquals("Failed to initialize communication with the OSM server "+serverUrl+".
"+
"Check the server URL in your preferences and your internet connection.",
ExceptionUtil.explainOsmTransferException(new OsmApiInitializationException("")));
@@ -361,12 +368,12 @@
ExceptionUtil.explainOsmTransferException(new OsmApiException(HttpURLConnection.HTTP_GONE, "", "")));
- assertEquals("The OSM server
'"+url+"'
reported an internal server error.
"+
+ assertEquals("The OSM server
'"+baseUrl+"'
reported an internal server error.
"+
"This is most likely a temporary problem. Please try again later.",
ExceptionUtil.explainOsmTransferException(new OsmApiException(HttpURLConnection.HTTP_INTERNAL_ERROR, "", "")));
- assertEquals("The OSM server '"+url+"' reported a bad request.
Error message(untranslated): ",
+ assertEquals("The OSM server '"+baseUrl+"' reported a bad request.
Error message(untranslated): ",
ExceptionUtil.explainOsmTransferException(new OsmApiException(HttpURLConnection.HTTP_BAD_REQUEST, "", "")));
- assertEquals("Communication with the OSM server '"+url+"'failed. The server replied
"+
+ assertEquals("Communication with the OSM server '"+baseUrl+"'failed. The server replied
"+
"the following error code and the following error message:
Error code: 509
"+
"Error message (untranslated): ",