Skip to content

Commit 9970d08

Browse files
ralfstxralfstx
committed
Use TestUtil consequently, code cleanup
* Use TestUtil where it was appropriate but not yet used * Use static imports for TestUtil * Organized imports
1 parent 6a0976b commit 9970d08

15 files changed

+62
-130
lines changed

‎com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Compatibility_Test.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323

2424
import static org.hamcrest.Matchers.greaterThan;
2525

26-
import static org.junit.Assert.assertFalse;
27-
import static org.junit.Assert.assertThat;
28-
import static org.junit.Assert.assertTrue;
26+
import static org.junit.Assert.*;
2927

3028

3129
@RunWith( value = Parameterized.class )

‎com.eclipsesource.jshint.test/src/com/eclipsesource/jshint/JSHint_Test.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
import static org.hamcrest.Matchers.containsString;
2323
import static org.hamcrest.Matchers.startsWith;
2424

25-
import static org.junit.Assert.assertEquals;
26-
import static org.junit.Assert.assertFalse;
27-
import static org.junit.Assert.assertThat;
28-
import static org.junit.Assert.assertTrue;
29-
import static org.junit.Assert.fail;
25+
import static org.junit.Assert.*;
3026

3127

3228
public class JSHint_Test {

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/CompatibilityUtil_Test.java

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,8 @@
2525
import com.eclipsesource.jshint.ui.internal.preferences.OptionsPreferences;
2626
import com.eclipsesource.jshint.ui.internal.preferences.PreferencesFactory;
2727

28-
import static com.eclipsesource.jshint.ui.test.TestUtil.BUILDER_ID;
29-
import static com.eclipsesource.jshint.ui.test.TestUtil.OLD_BUILDER_ID;
30-
import static com.eclipsesource.jshint.ui.test.TestUtil.OLD_SETTINGS_FILE_NAME;
31-
import static com.eclipsesource.jshint.ui.test.TestUtil.SETTINGS_FILE_NAME;
32-
import static com.eclipsesource.jshint.ui.test.TestUtil.SETTINGS_FOLDER_PATH;
33-
import static com.eclipsesource.jshint.ui.test.TestUtil.SETTINGS_TEMPLATE_0_9;
34-
import static com.eclipsesource.jshint.ui.test.TestUtil.createExampleSettingsFile;
35-
import static com.eclipsesource.jshint.ui.test.TestUtil.createFile;
36-
import static com.eclipsesource.jshint.ui.test.TestUtil.createFolder;
37-
import static com.eclipsesource.jshint.ui.test.TestUtil.createProject;
38-
import static com.eclipsesource.jshint.ui.test.TestUtil.deleteProject;
39-
import static com.eclipsesource.jshint.ui.test.TestUtil.list;
40-
import static com.eclipsesource.jshint.ui.test.TestUtil.readContent;
41-
import static org.junit.Assert.assertEquals;
42-
import static org.junit.Assert.assertFalse;
43-
import static org.junit.Assert.assertNotNull;
44-
import static org.junit.Assert.assertNull;
45-
import static org.junit.Assert.assertTrue;
28+
import static com.eclipsesource.jshint.ui.test.TestUtil.*;
29+
import static org.junit.Assert.*;
4630

4731

4832
public class CompatibilityUtil_Test {
@@ -106,7 +90,7 @@ public void getCurrentVersion() {
10690
}
10791

10892
@Test
109-
public void addsVersionToPreferences() throws Exception {
93+
public void addsVersionToPreferences() {
11094
Version currentVersion = CompatibilityUtil.getCurrentVersion();
11195
Preferences wsPrefs = PreferencesFactory.getWorkspacePreferences();
11296

@@ -128,7 +112,7 @@ public void turnsEnabledToBasicIncludes() throws Exception {
128112
}
129113

130114
@Test
131-
public void fixPre09FolderExcludePatterns_addsSlashesForFolder() throws Exception {
115+
public void fixPre09FolderExcludePatterns_addsSlashesForFolder() {
132116
createFolder( project, "/target" );
133117
Preferences node = PreferencesFactory.getProjectPreferences( project );
134118
EnablementPreferences enablePrefs = new EnablementPreferences( node );
@@ -140,7 +124,7 @@ public void fixPre09FolderExcludePatterns_addsSlashesForFolder() throws Exceptio
140124
}
141125

142126
@Test
143-
public void fixPre09FolderExcludePatterns_doesNotAddSlashesForFile() throws Exception {
127+
public void fixPre09FolderExcludePatterns_doesNotAddSlashesForFile() {
144128
createFile( project, "/test.js", "" );
145129
Preferences node = PreferencesFactory.getProjectPreferences( project );
146130
EnablementPreferences enablePrefs = new EnablementPreferences( node );
@@ -152,7 +136,7 @@ public void fixPre09FolderExcludePatterns_doesNotAddSlashesForFile() throws Exce
152136
}
153137

154138
@Test
155-
public void fixPre09FolderExcludePatterns_doesNotAddAdditionalSlashes() throws Exception {
139+
public void fixPre09FolderExcludePatterns_doesNotAddAdditionalSlashes() {
156140
createFolder( project, "/target" );
157141
Preferences node = PreferencesFactory.getProjectPreferences( project );
158142
EnablementPreferences enablePrefs = new EnablementPreferences( node );
@@ -164,7 +148,7 @@ public void fixPre09FolderExcludePatterns_doesNotAddAdditionalSlashes() throws E
164148
}
165149

166150
@Test
167-
public void fixPre09FolderExcludePatterns_worksForPre_0_9_4() throws Exception {
151+
public void fixPre09FolderExcludePatterns_worksForPre_0_9_4() {
168152
createFolder( project, "/target" );
169153
Preferences node = PreferencesFactory.getProjectPreferences( project );
170154
EnablementPreferences enablePrefs = new EnablementPreferences( node );
@@ -177,7 +161,7 @@ public void fixPre09FolderExcludePatterns_worksForPre_0_9_4() throws Exception {
177161
}
178162

179163
@Test
180-
public void fixPre09FolderExcludePatterns_skips_0_9_4() throws Exception {
164+
public void fixPre09FolderExcludePatterns_skips_0_9_4() {
181165
createFolder( project, "/target" );
182166
Preferences node = PreferencesFactory.getProjectPreferences( project );
183167
EnablementPreferences enablePrefs = new EnablementPreferences( node );
@@ -190,7 +174,7 @@ public void fixPre09FolderExcludePatterns_skips_0_9_4() throws Exception {
190174
}
191175

192176
@Test
193-
public void doesNotChangeProjectsWithoutSettings() throws Exception {
177+
public void doesNotChangeProjectsWithoutSettings() {
194178
CompatibilityUtil.run();
195179

196180
IFolder settingsFolder = project.getFolder( SETTINGS_FOLDER_PATH );

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/builder/BuilderUtil_Test.java

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,35 @@
1010
******************************************************************************/
1111
package com.eclipsesource.jshint.ui.internal.builder;
1212

13-
import static org.junit.Assert.assertFalse;
14-
import static org.junit.Assert.assertTrue;
15-
16-
import java.io.ByteArrayInputStream;
1713
import java.io.IOException;
1814

1915
import org.eclipse.core.resources.IFile;
2016
import org.eclipse.core.resources.IProject;
21-
import org.eclipse.core.resources.IWorkspace;
22-
import org.eclipse.core.resources.ResourcesPlugin;
2317
import org.eclipse.core.runtime.CoreException;
2418
import org.junit.After;
2519
import org.junit.Before;
2620
import org.junit.Test;
2721

2822
import com.eclipsesource.jshint.ui.test.TestUtil;
2923

24+
import static com.eclipsesource.jshint.ui.test.TestUtil.*;
25+
import static org.junit.Assert.assertFalse;
26+
import static org.junit.Assert.assertTrue;
27+
3028

3129
public class BuilderUtil_Test {
3230

3331
private IProject project;
34-
private IFile file;
3532

3633
@Before
37-
public void setUp() throws CoreException {
38-
IWorkspace workspace = ResourcesPlugin.getWorkspace();
39-
project = workspace.getRoot().getProject( "test.project" );
40-
project.create( null );
41-
project.open( null );
42-
file = project.getFile( "/test.js" );
43-
file.create( new ByteArrayInputStream( "test".getBytes() ), true, null );
34+
public void setUp() {
35+
project = createProject( "test" );
36+
createFile( project, "/test.js", "test" );
4437
}
4538

4639
@After
47-
public void tearDown() throws CoreException {
48-
if( project.exists() ) {
49-
project.delete( true, null );
50-
}
40+
public void tearDown() {
41+
deleteProject( project );
5142
}
5243

5344
@Test
@@ -56,7 +47,7 @@ public void addBuilder() throws CoreException, IOException {
5647

5748
assertTrue( result );
5849
IFile metadata = project.getFile( ".project" );
59-
assertTrue( TestUtil.readContent( metadata ).contains( TestUtil.BUILDER_ID ) );
50+
assertTrue( readContent( metadata ).contains( TestUtil.BUILDER_ID ) );
6051
}
6152

6253
@Test
@@ -76,7 +67,7 @@ public void removeBuilder() throws CoreException, IOException {
7667

7768
assertTrue( result );
7869
IFile metadata = project.getFile( ".project" );
79-
assertFalse( TestUtil.readContent( metadata ).contains( TestUtil.BUILDER_ID ) );
70+
assertFalse( readContent( metadata ).contains( TestUtil.BUILDER_ID ) );
8071
}
8172

8273
@Test

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/builder/MarkerAdapter_Test.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,16 @@
1010
******************************************************************************/
1111
package com.eclipsesource.jshint.ui.internal.builder;
1212

13-
import java.io.ByteArrayInputStream;
14-
1513
import org.eclipse.core.resources.IFile;
1614
import org.eclipse.core.resources.IMarker;
1715
import org.eclipse.core.resources.IProject;
1816
import org.eclipse.core.resources.IResource;
19-
import org.eclipse.core.resources.IWorkspace;
20-
import org.eclipse.core.resources.ResourcesPlugin;
2117
import org.eclipse.core.runtime.CoreException;
2218
import org.junit.After;
2319
import org.junit.Before;
2420
import org.junit.Test;
2521

22+
import static com.eclipsesource.jshint.ui.test.TestUtil.*;
2623
import static org.junit.Assert.assertEquals;
2724
import static org.junit.Assert.assertNull;
2825

@@ -36,20 +33,14 @@ public class MarkerAdapter_Test {
3633
private IFile file;
3734

3835
@Before
39-
public void setUp() throws CoreException {
40-
IWorkspace workspace = ResourcesPlugin.getWorkspace();
41-
project = workspace.getRoot().getProject( TEST_PROJECT );
42-
project.create( null );
43-
project.open( null );
44-
file = project.getFile( "/test.js" );
45-
file.create( new ByteArrayInputStream( "test".getBytes() ), true, null );
36+
public void setUp() {
37+
project = createProject( TEST_PROJECT );
38+
file = createFile( project, "/test.js", "test" );
4639
}
4740

4841
@After
49-
public void tearDown() throws CoreException {
50-
if( project.exists() ) {
51-
project.delete( true, null );
52-
}
42+
public void tearDown() {
43+
deleteProject( project );
5344
}
5445

5546
@Test

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/preferences/IncludesView_Test.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
import org.junit.Test;
2424

2525
import com.eclipsesource.jshint.ui.internal.preferences.ui.IncludesView;
26-
import com.eclipsesource.jshint.ui.test.TestUtil;
2726

28-
import static com.eclipsesource.jshint.ui.test.TestUtil.list;
27+
import static com.eclipsesource.jshint.ui.test.TestUtil.*;
2928
import static org.junit.Assert.assertEquals;
3029
import static org.junit.Assert.assertTrue;
3130

@@ -40,13 +39,13 @@ public class IncludesView_Test {
4039
public void setUp() {
4140
Display display = Display.getDefault();
4241
parent = new Shell( display );
43-
project = TestUtil.createProject( "test" );
42+
project = createProject( "test" );
4443
preferences = new EnablementPreferences( new PreferencesMock( "test" ) );
4544
}
4645

4746
@After
4847
public void tearDown() {
49-
TestUtil.deleteProject( project );
48+
deleteProject( project );
5049
parent.dispose();
5150
}
5251

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/preferences/JSHintPreferences_Test.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
import org.osgi.service.prefs.BackingStoreException;
1616
import org.osgi.service.prefs.Preferences;
1717

18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertFalse;
20-
import static org.junit.Assert.assertTrue;
18+
import static org.junit.Assert.*;
2119

2220

2321
public class JSHintPreferences_Test {

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/preferences/OptionParserUtil_Test.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
import org.junit.Test;
1616

1717
import com.eclipsesource.jshint.Configuration;
18-
import com.eclipsesource.jshint.ui.internal.preferences.OptionParserUtil;
1918
import com.eclipsesource.jshint.ui.internal.preferences.OptionParserUtil.Entry;
2019

21-
import static org.junit.Assert.assertEquals;
22-
import static org.junit.Assert.assertFalse;
23-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.Assert.*;
2421

2522

2623
public class OptionParserUtil_Test {

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/preferences/OptionsPreferences_Test.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
import org.junit.Test;
1515
import org.osgi.service.prefs.BackingStoreException;
1616

17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertFalse;
19-
import static org.junit.Assert.assertTrue;
17+
import static org.junit.Assert.*;
2018

2119

2220
public class OptionsPreferences_Test {

‎com.eclipsesource.jshint.ui.test/src/com/eclipsesource/jshint/ui/internal/preferences/PathPattern_Test.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414

1515
import org.junit.Test;
1616

17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertFalse;
19-
import static org.junit.Assert.assertTrue;
20-
import static org.junit.Assert.fail;
17+
import static org.junit.Assert.*;
2118

2219

2320
public class PathPattern_Test {

0 commit comments

Comments
 (0)