@@ -67,18 +67,18 @@ public void testM1ChildrenAreThere() throws Exception {
6767 _expand (rootItems );
6868 TreeItem p1Item = rootItems [_p1Ind ];
6969
70- assertEquals ("P1 tree item should be an M1Project" , M1Project .class ,
71- p1Item .getData ().getClass ());
70+ assertEquals (M1Project .class ,
71+ p1Item .getData ().getClass (), "P1 tree item should be an M1Project" );
7272
7373 TreeItem [] p1Children = p1Item .getItems ();
7474 _expand (p1Children );
7575
7676 TreeItem f1Child = _findChild ("f1" , p1Children );
77- assertNotNull ("P1 should have a child named f1" , f1Child );
77+ assertNotNull (f1Child , "P1 should have a child named f1" );
7878
7979 TreeItem [] f1Children = f1Child .getItems ();
80- assertEquals ("[bug #285353] f1 folder should have 2 children" , 2 ,
81- f1Children .length );
80+ assertEquals (2 ,
81+ f1Children .length , "[bug #285353] f1 folder should have 2 children" );
8282 }
8383
8484 /** Test that when M2 is not active F1 has two children. */
@@ -100,10 +100,10 @@ public void testM1ChildrenAreThereWithoutM2() throws Exception {
100100
101101 TreeItem f1Child = _findChild ("f1" , p1Children );
102102
103- assertNotNull ("P1 should have a child named f1" , f1Child );
103+ assertNotNull (f1Child , "P1 should have a child named f1" );
104104
105105 TreeItem [] f1Children = f1Child .getItems ();
106- assertEquals ("f1 folder should have 2 children" , 2 , f1Children . length );
106+ assertEquals (2 , f1Children . length , "f1 folder should have 2 children" );
107107 }
108108
109109 /** Tests that file2.txt in p2 is provided by M2 content provider. */
@@ -122,9 +122,9 @@ public void testM2Override() throws Exception {
122122 DisplayHelper .sleep (10000000 );
123123
124124 TreeItem file2Child = _findChild ("file2.txt" , p2Children );
125- assertNotNull ("P2 should have a child named file2.txt" , file2Child );
126- assertEquals ("file2.txt should be provided by M2 content provider" ,
127- M2File . class , file2Child . getData (). getClass () );
125+ assertNotNull (file2Child , "P2 should have a child named file2.txt" );
126+ assertEquals (M2File . class , file2Child . getData (). getClass () ,
127+ "file2.txt should be provided by M2 content provider" );
128128
129129 }
130130
@@ -149,8 +149,8 @@ public void testInterceptAdd() throws CoreException {
149149 TreeItem folder1Item = _findChild (NEW_FOLDER_1 , rootItems [_p1Ind ]
150150 .getItems ());
151151
152- assertNotNull ("M1 interceptAdd method should have been called" ,
153- folder1Item );
152+ assertNotNull (folder1Item ,
153+ "M1 interceptAdd method should have been called" );
154154 }
155155
156156 /**
@@ -178,9 +178,8 @@ public void XXXtestInterceptRemove() throws CoreException {
178178
179179 newFolder1 .delete (true , new NullProgressMonitor ());
180180 folder1Item = _findChild (NEW_FOLDER_1 , rootItems [_p1Ind ].getItems ());
181- assertNull (
182- "[bug 285529] M1 interceptRemove method should have been called" ,
183- folder1Item );
181+ assertNull (folder1Item ,
182+ "[bug 285529] M1 interceptRemove method should have been called" );
184183 }
185184
186185 /**
@@ -207,14 +206,12 @@ public void XXXtestInterceptRefreshOnChildTypeChange() throws CoreException {
207206 M2ContentProvider .resetCounters ();
208207 ResourcesPlugin .getWorkspace ().run (runnable , new NullProgressMonitor ());
209208
210- assertTrue (
211- "[bug 285529] M1 intercept update or refresh should have been called" ,
212- M1ContentProvider .getInterceptRefreshCount ()
213- + M1ContentProvider .getInterceptUpdateCount () >= 1 );
214- assertTrue (
215- "[bug 285529] M2 intercept update or refresh should have been called" ,
216- M2ContentProvider .getInterceptRefreshCount ()
217- + M2ContentProvider .getInterceptUpdateCount () >= 1 );
209+ assertTrue (M1ContentProvider .getInterceptRefreshCount ()
210+ + M1ContentProvider .getInterceptUpdateCount () >= 1 ,
211+ "[bug 285529] M1 intercept update or refresh should have been called" );
212+ assertTrue (M2ContentProvider .getInterceptRefreshCount ()
213+ + M2ContentProvider .getInterceptUpdateCount () >= 1 ,
214+ "[bug 285529] M2 intercept update or refresh should have been called" );
218215 }
219216
220217}
0 commit comments