Added SetupDiOpenDevRegKey(..), SetupDiEnumDeviceInfo(..) and some constants #335
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * Copyright [2014] [Christian Schwarz] | ||
| * | ||
| * 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 com.sun.jna.platform.win32; | ||
|
|
||
| import static com.sun.jna.Native.getLastError; | ||
| import static com.sun.jna.platform.win32.SetupApi.DICS_FLAG_GLOBAL; | ||
| import static com.sun.jna.platform.win32.SetupApi.DIGCF_ALLCLASSES; | ||
| import static com.sun.jna.platform.win32.SetupApi.DIGCF_DEVICEINTERFACE; | ||
| import static com.sun.jna.platform.win32.SetupApi.DIGCF_PRESENT; | ||
| import static com.sun.jna.platform.win32.SetupApi.DIREG_DEV; | ||
| import static com.sun.jna.platform.win32.SetupApi.GUID_DEVINTERFACE_COMPORT; | ||
| import static com.sun.jna.platform.win32.WinBase.INVALID_HANDLE_VALUE; | ||
| import static com.sun.jna.platform.win32.WinError.ERROR_NO_MORE_ITEMS; | ||
| import static com.sun.jna.platform.win32.WinNT.KEY_QUERY_VALUE; | ||
| import junit.framework.TestCase; | ||
|
|
||
| import com.sun.jna.platform.win32.SetupApi.SP_DEVINFO_DATA; | ||
| import com.sun.jna.platform.win32.WinNT.HANDLE; | ||
| import com.sun.jna.platform.win32.WinReg.HKEY; | ||
|
|
||
| /** | ||
| * Tests the mappings of {@link SetupApi} | ||
| * | ||
| * @author Christian Schwarz | ||
| * | ||
| */ | ||
| public class SetupApiTest extends TestCase { | ||
| /** This is the class under test */ | ||
| private final SetupApi setupApi = SetupApi.INSTANCE; | ||
| /** */ | ||
| private final Advapi32 advapi32 = Advapi32.INSTANCE; | ||
|
There was a problem hiding this comment. Get rid of these, and just use |
||
|
|
||
| /** member index for the first device, see {@link SetupApi#SetupDiEnumDeviceInfo(HANDLE, int, SP_DEVINFO_DATA)} */ | ||
| private static final int FIRST_MEMBER = 0; | ||
|
There was a problem hiding this comment. Again, no need to be global in the test class. |
||
|
|
||
| /** used by multiple test, to get device informations */ | ||
| private SP_DEVINFO_DATA devInfo; | ||
|
|
||
| public static void main(String[] args) { | ||
| junit.textui.TestRunner.run(SetupApiTest.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected void setUp() throws Exception { | ||
| devInfo = new SP_DEVINFO_DATA(); | ||
|
There was a problem hiding this comment. Why does this need to be a member of the test. Just move it into the implementation of each test, easier to read and easier to understand. No sharing needed. There was a problem hiding this comment. I think just the opposite, its noise if the same code is duplicated in several places, it distracts the reader form the essicial, just a matter of taste... There was a problem hiding this comment. Yes, but I want things to be written consistently with other tests, nothing personal :) |
||
| } | ||
|
|
||
| /** | ||
| * Tests the mapping of {@link SetupApi#SetupDiOpenDevRegKey(HANDLE, SP_DEVINFO_DATA, int, int, int, int)}. | ||
| * <p> | ||
| * The test pass if SetupDiOpenDevRegKey(..) returns a valid {@link HKEY} pointing to the first found device on the | ||
| * current machine. | ||
| * <p> | ||
| * NOTE: We only test the mapping of SetupDiOpenDevRegKey(..), not it's functionality. | ||
| */ | ||
| public void testSetupDiOpenDevRegKey() { | ||
| // hDevInfoSet repesents a list of installed devices for all device setup classes or all device interface | ||
| // classes | ||
| HANDLE hDevInfoSet = setupApi.SetupDiGetClassDevs(null, null, null, DIGCF_ALLCLASSES); | ||
| assertTrue(hDevInfoSet != INVALID_HANDLE_VALUE); | ||
|
|
||
| // there must be least one device (drive,processor,pci,usb,...) on the current machine | ||
| assertTrue(setupApi.SetupDiEnumDeviceInfo(hDevInfoSet, FIRST_MEMBER, devInfo)); | ||
|
|
||
| HKEY hDeviceKey = setupApi.SetupDiOpenDevRegKey(hDevInfoSet, devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE); | ||
| assertTrue(hDeviceKey != INVALID_HANDLE_VALUE); | ||
|
|
||
| advapi32.RegCloseKey(hDeviceKey); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Tests the mapping of {@link SetupApi#SetupDiEnumDeviceInfo(HANDLE, int, SP_DEVINFO_DATA)} . | ||
| * <p> | ||
| * There are 2 different results possible, depending availability of an COM-Port on the current machine: | ||
| * <ul> | ||
| * <li>If the current machine has no COM-Port the method must fail and the the last error indicate that there are no | ||
| * more values / COM-Ports. | ||
| * <li>If the current machine has at least one COM-Port the method must succeed. The test pass if no exception is | ||
| * thrown. | ||
| * </ul> | ||
| */ | ||
| public void testSetupDiEnumDeviceInfo() { | ||
| HANDLE hDevInfoSet = setupApi.SetupDiGetClassDevs(GUID_DEVINTERFACE_COMPORT, null, null, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); | ||
|
There was a problem hiding this comment. Assert that this handle is valid. |
||
| boolean succeed = setupApi.SetupDiEnumDeviceInfo(hDevInfoSet, FIRST_MEMBER, devInfo); | ||
| if (!succeed) | ||
|
There was a problem hiding this comment. Same as above. This is a test. You should check that the return value is correct and examine some fields in |
||
| assertTrue(getLastError() == ERROR_NO_MORE_ITEMS); | ||
|
|
||
|
There was a problem hiding this comment. This test should be predictable, ie. the function returns There was a problem hiding this comment. as the javadoc states the test can have two different outcomes that are valid, but it depends on your hardware, not all machines have serial-port, so what to do here? There was a problem hiding this comment. You're right, maybe you want to express this clearer: |
||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make this look like all the other changelog items.
(..).