Skip to content

Commit

Permalink
Fix error messages, #134
Browse files Browse the repository at this point in the history
  • Loading branch information
gnodet committed Apr 3, 2019
1 parent 3101eeb commit bbd72d6
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import java.io.IOException;
import java.io.OutputStream; // expected diff with WindowsAnsiPrintStream.java

import org.fusesource.jansi.internal.WindowsSupport;
import org.fusesource.jansi.internal.Kernel32.CONSOLE_SCREEN_BUFFER_INFO;
import org.fusesource.jansi.internal.Kernel32.COORD;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import java.io.IOException;
import java.io.PrintStream; // expected diff with WindowsAnsiOutputStream.java

import org.fusesource.jansi.internal.WindowsSupport;
import org.fusesource.jansi.internal.Kernel32.CONSOLE_SCREEN_BUFFER_INFO;
import org.fusesource.jansi.internal.Kernel32.COORD;

Expand Down
42 changes: 42 additions & 0 deletions jansi/src/main/java/org/fusesource/jansi/WindowsSupport.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Copyright (C) 2009-2019 the original author(s).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.fusesource.jansi;

import java.io.UnsupportedEncodingException;

import static org.fusesource.jansi.internal.Kernel32.FORMAT_MESSAGE_FROM_SYSTEM;
import static org.fusesource.jansi.internal.Kernel32.FormatMessageW;
import static org.fusesource.jansi.internal.Kernel32.GetLastError;

public class WindowsSupport {

public static String getLastErrorMessage() {
int errorCode = GetLastError();
return getErrorMessage(errorCode);
}

public static String getErrorMessage(int errorCode) {
int bufferSize = 160;
byte data[] = new byte[bufferSize];
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, 0, errorCode, 0, data, bufferSize, null);
try {
return new String(data, "UTF-16LE").trim();
} catch (UnsupportedEncodingException e) {
throw new IllegalStateException(e);
}
}

}
33 changes: 33 additions & 0 deletions jansi/src/test/java/org/fusesource/jansi/WindowsSupportTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2009-2019 the original author(s).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.fusesource.jansi;

import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assume.assumeTrue;

public class WindowsSupportTest {

@Test
public void testErrorMessage() {
assumeTrue(AnsiConsole.IS_WINDOWS);
String msg = WindowsSupport.getErrorMessage(500);
assertEquals(msg, "User profile cannot be loaded.");
}
}

0 comments on commit bbd72d6

Please sign in to comment.