@@ -168,7 +168,7 @@ public void layoutFLATPrepareSourcesTest() throws CoreException, IOException, In
168168
169169 ByteArrayOutputStream bos = new ByteArrayOutputStream ();
170170 IStatus is = rpmProject .buildPrep (bos );
171- assertTrue (is .isOK (), "Status should have been OK but is:" + is .toString ());
171+ assertTrue (is .isOK (), "Status should have been OK but is:" + is .toString () + ". Output:" + bos . toString () );
172172
173173 checkPreparedSources (rpmProject , RPMProjectLayout .FLAT );
174174 }
@@ -184,16 +184,16 @@ public void checkDownloadedFile(RPMProject project, RPMProjectLayout layout) thr
184184 IContainer sourcesFolder = project .getConfiguration ().getSourcesFolder ();
185185 assertNotNull (sourcesFolder );
186186 switch (layout ) {
187- case RPMBUILD :
188- assertNotNull (sourcesFolder .getParent ().findMember ("SOURCES" ));
189- assertEquals (4 , sourcesFolder .members ().length );
190- // check if the file exists under SOURCES folder
191- assertNotNull (sourcesFolder .findMember (new Path ("hello-2.12.1.tar.gz" )));
192- break ;
193- case FLAT :
194- assertEquals (8 , sourcesFolder .members ().length );
195- assertNotNull (sourcesFolder .findMember (new Path ("hello-2.12.1.tar.gz" )));
196- break ;
187+ case RPMBUILD :
188+ assertNotNull (sourcesFolder .getParent ().findMember ("SOURCES" ));
189+ assertEquals (4 , sourcesFolder .members ().length );
190+ // check if the file exists under SOURCES folder
191+ assertNotNull (sourcesFolder .findMember (new Path ("hello-2.12.1.tar.gz" )));
192+ break ;
193+ case FLAT :
194+ assertEquals (8 , sourcesFolder .members ().length );
195+ assertNotNull (sourcesFolder .findMember (new Path ("hello-2.12.1.tar.gz" )));
196+ break ;
197197 }
198198 }
199199
@@ -211,22 +211,22 @@ public void checkPreparedSources(RPMProject project, RPMProjectLayout layout) th
211211 // See https://rpm-software-management.github.io/rpm/manual/dynamic_specs.html
212212 // for the *-SPECPARTS extra dir
213213 switch (layout ) {
214- case RPMBUILD :
215- assertNotNull (buildFolder .getParent ().findMember ("BUILD" ));
216- assertEquals (1 , buildFolder .members ().length );
217- // check if the file exists under BUILD folder
218- helloBuildFolder = buildFolder .getFolder (new Path ("hello-2.12.1-build" ));
219- assertTrue (helloBuildFolder .exists ());
220- // there should be some stuff within hello-2.8/ folder
221- assertTrue (helloBuildFolder .members ().length >= 1 );
222- break ;
223- case FLAT :
224- assertEquals (9 , buildFolder .members ().length );
225- helloBuildFolder = buildFolder .getFolder (new Path ("hello-2.12.1-build" ));
226- assertTrue (helloBuildFolder .exists ());
227- // there should be some stuff within hello-2.12.1/ folder
228- assertTrue (helloBuildFolder .members ().length >= 1 );
229- break ;
214+ case RPMBUILD :
215+ assertNotNull (buildFolder .getParent ().findMember ("BUILD" ));
216+ assertEquals (1 , buildFolder .members ().length );
217+ // check if the file exists under BUILD folder
218+ helloBuildFolder = buildFolder .getFolder (new Path ("hello-2.12.1-build" ));
219+ assertTrue (helloBuildFolder .exists ());
220+ // there should be some stuff within hello-2.8/ folder
221+ assertTrue (helloBuildFolder .members ().length >= 1 );
222+ break ;
223+ case FLAT :
224+ assertEquals (9 , buildFolder .members ().length );
225+ helloBuildFolder = buildFolder .getFolder (new Path ("hello-2.12.1-build" ));
226+ assertTrue (helloBuildFolder .exists ());
227+ // there should be some stuff within hello-2.12.1/ folder
228+ assertTrue (helloBuildFolder .members ().length >= 1 );
229+ break ;
230230 }
231231 }
232232
0 commit comments