Browse Source

Fix deprecated code

tags/5.2-RC1
David Gageot 8 years ago
parent
commit
38df1425f5

+ 2
- 2
server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java View File

@@ -48,7 +48,7 @@ public class AesCipherTest {
String key = cipher.generateRandomSecretKey();

assertThat(StringUtils.isNotBlank(key)).isTrue();
assertThat(Base64.isArrayByteBase64(key.getBytes())).isTrue();
assertThat(Base64.isBase64(key.getBytes())).isTrue();
}

@Test
@@ -58,7 +58,7 @@ public class AesCipherTest {
String encryptedText = cipher.encrypt("this is a secret");

assertThat(StringUtils.isNotBlank(encryptedText)).isTrue();
assertThat(Base64.isArrayByteBase64(encryptedText.getBytes())).isTrue();
assertThat(Base64.isBase64(encryptedText.getBytes())).isTrue();
}

@Test

+ 1
- 1
sonar-duplications/src/test/java/org/sonar/duplications/detector/DetectorTestCase.java View File

@@ -34,11 +34,11 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;

import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.matchers.JUnitMatchers.hasItem;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;

+ 5
- 5
sonar-duplications/src/test/java/org/sonar/duplications/junit/TestNamePrinter.java View File

@@ -19,14 +19,14 @@
*/
package org.sonar.duplications.junit;

import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;

public class TestNamePrinter extends TestWatchman {
public class TestNamePrinter extends TestWatcher {

@Override
public void starting(FrameworkMethod method) {
System.out.println("Executing " + method.getName());
protected void starting(Description description) {
System.out.println("Executing " + description.getMethodName());
}

}

+ 1
- 1
sonar-testing-harness/src/test/java/org/sonar/test/JsonAssertTest.java View File

@@ -72,7 +72,7 @@ public class JsonAssertTest {

@Test(expected = IllegalStateException.class)
public void fail_to_load_url() throws Exception {
assertJson(new File("target/missing").toURL());
assertJson(new File("target/missing").toURI().toURL());
}

@Test

Loading…
Cancel
Save