Fix compiler warnings, update JDT settings
Change-Id: I87a9e744676385473660978241fe2eadf26a3604
diff --git a/bundles/org.eclipse.rap.addons.ckeditor/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.rap.addons.ckeditor/.settings/org.eclipse.jdt.core.prefs
index 809819e..bde1e2c 100644
--- a/bundles/org.eclipse.rap.addons.ckeditor/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.rap.addons.ckeditor/.settings/org.eclipse.jdt.core.prefs
@@ -102,7 +102,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/examples/org.eclipse.rap.demo.ckeditor/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.rap.demo.ckeditor/.settings/org.eclipse.jdt.core.prefs
index 809819e..bde1e2c 100644
--- a/examples/org.eclipse.rap.demo.ckeditor/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.rap.demo.ckeditor/.settings/org.eclipse.jdt.core.prefs
@@ -102,7 +102,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/examples/org.eclipse.rap.examples.pages.ckeditor/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.rap.examples.pages.ckeditor/.settings/org.eclipse.jdt.core.prefs
index 809819e..bde1e2c 100644
--- a/examples/org.eclipse.rap.examples.pages.ckeditor/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.rap.examples.pages.ckeditor/.settings/org.eclipse.jdt.core.prefs
@@ -102,7 +102,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/tests/org.eclipse.rap.addons.ckeditor.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.rap.addons.ckeditor.test/.settings/org.eclipse.jdt.core.prefs
index 809819e..bde1e2c 100644
--- a/tests/org.eclipse.rap.addons.ckeditor.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.rap.addons.ckeditor.test/.settings/org.eclipse.jdt.core.prefs
@@ -102,7 +102,7 @@
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/tests/org.eclipse.rap.addons.ckeditor.test/src/org/eclipse/rap/addons/ckeditor/CKEditor_Test.java b/tests/org.eclipse.rap.addons.ckeditor.test/src/org/eclipse/rap/addons/ckeditor/CKEditor_Test.java
index f7f4783..5af1dd9 100644
--- a/tests/org.eclipse.rap.addons.ckeditor.test/src/org/eclipse/rap/addons/ckeditor/CKEditor_Test.java
+++ b/tests/org.eclipse.rap.addons.ckeditor.test/src/org/eclipse/rap/addons/ckeditor/CKEditor_Test.java
@@ -11,7 +11,6 @@
package org.eclipse.rap.addons.ckeditor;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -62,28 +61,23 @@
editor = new CKEditor( shell, SWT.BORDER );
}
- @Test
- public void testSetLayout() {
- try {
- editor.setLayout( new FillLayout() );
- fail();
- } catch( UnsupportedOperationException ex ) {
- // expected
- }
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetLayout_fails() {
+ editor.setLayout( new FillLayout() );
}
@Test
- public void testContructor_CreatesRemoteObjectWithCorrectType() {
+ public void testContructor_createsRemoteObjectWithCorrectType() {
verify( connection ).createRemoteObject( eq( "eclipsesource.CKEditor" ) );
}
@Test
- public void testContructor_SetsParent() {
+ public void testContructor_setsParent() {
verify( remoteObject ).set( "parent", WidgetUtil.getId( editor ) );
}
@Test
- public void testContructor_LoadsJavaScriptFiles() {
+ public void testContructor_loadsJavaScriptFiles() {
JavaScriptLoader loader = mockJavaScriptLoader();
ResourceManager resourceManager = RWT.getResourceManager();
@@ -95,7 +89,7 @@
}
@Test
- public void testSetText_GetText() {
+ public void testSetText_affectsGetText() {
String text = "foo<span>bar</span>";
editor.setText( text );
@@ -104,7 +98,7 @@
}
@Test
- public void testSetText_RendersToClient() {
+ public void testSetText_rendersToClient() {
String text = "foo<span>bar</span>";
editor.setText( text );
@@ -112,18 +106,13 @@
verify( remoteObject ).set( "text", text );
}
- @Test
- public void testSetTextNull() {
- try {
- editor.setText( null );
- fail();
- } catch( IllegalArgumentException ex ) {
- // expected
- }
+ @Test( expected = IllegalArgumentException.class )
+ public void testSetText_failsWithNull() {
+ editor.setText( null );
}
@Test
- public void testSetTextFromClient() {
+ public void testSetText_fromClient() {
String text = "foo<span>bar</span>";
remoteSet( remoteObject, "text", JsonValue.valueOf( text ) );
@@ -132,22 +121,19 @@
}
@Test
- public void testSetFont_RendersToClient() {
+ public void testSetFont_rendersToClient() {
editor.setFont( new Font( display, "fantasy", 13, 0 ) );
verify( remoteObject ).set( "font", "13px fantasy" );
}
@Test
- public void testDispose_RendersDestroyToClient() {
+ public void testDispose_rendersDestroyToClient() {
editor.dispose();
verify( remoteObject ).destroy();
}
- /////////
- // Helper
-
private JavaScriptLoader mockJavaScriptLoader() {
WebClient client = mock( WebClient.class );
context.replaceClient( client );
