Remove PowerMock usage in tests ------------------------------- Key: JBIDE-24375 URL: https://issues.jboss.org/browse/JBIDE-24375 Project: Tools (JBoss Tools) Issue Type: Task Components: openshift Affects Versions: 4.4.4.AM3 Reporter: Aurélien Pupier I create this issue to gather ideas to get rid of it. see https://github.com/jbosstools/jbosstools-openshift/blob/cf544dbec4baa87c6... from why i understand, PowerMock is used only to mock a singleton access in a static method. The reasonable seems to avoid static method: OpenShiftServerUtils. If we are using an instanciation for this class, then, the call to create the Watcher can be extracted in a method and this method would be classically mockable with Mockito.