[JENKINS-17230] Updating FB8790 test

jenkinsci · Apr 11, 2013 · e3e8252 · e3e8252
1 parent bb78bdc
commit e3e8252
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/net/praqma/jenkins/configrotator/scm/clearcaseucm/PrepareWorkspace.java b/src/main/java/net/praqma/jenkins/configrotator/scm/clearcaseucm/PrepareWorkspace.java
@@ -72,7 +72,7 @@ public SnapshotView invoke( File workspace, VirtualChannel channel ) throws IOEx
                 out.println( ConfigurationRotator.LOGGERNAME + "View tag : " + viewtag );
 				//view = ViewUtils.createView( devStream, "ALL", new File( workspace, "view" ), viewtag, true );
                 view = new GetView( new File( workspace, "view" ), viewtag ).get();
-                new UpdateView( view ).update();
+                new UpdateView( view ).swipe().overwrite().update();
 			} catch( ClearCaseException e ) {
 				throw new IOException( "Unable to create view", e );
 			}

diff --git a/src/test/java/net/praqma/jenkins/configrotator/functional/scm/clearcase/FB8790.java b/src/test/java/net/praqma/jenkins/configrotator/functional/scm/clearcase/FB8790.java
@@ -58,11 +58,16 @@ public void removeTarget() throws IOException, ExecutionException, InterruptedEx
 
         AbstractBuild<?, ?> build = crrule.buildProject( project.getJenkinsProject(), false, null );
 
+        FilePath path = new FilePath( project.getJenkinsProject().getLastBuiltOn().getWorkspaceFor( (FreeStyleProject)project.getJenkinsProject() ), "view/" + ccenv.getUniqueName() );
+        listPath( path );
+
         SystemValidator<ClearCaseUCMTarget> val = new SystemValidator<ClearCaseUCMTarget>( build );
         val.checkExpectedResult( Result.SUCCESS ).
                 checkAction( true ).
                 checkCompatability( true ).
                 checkTargets( new ClearCaseUCMTarget( "model-1@" + ccenv.getPVob() + ", INITIAL, false" ), new ClearCaseUCMTarget( "client-1@" + ccenv.getPVob() + ", INITIAL, false" ) ).
+                addElementToPathCheck( path, new SystemValidator.Element( "Model", true ) ).
+                addElementToPathCheck( path, new SystemValidator.Element( "Clientapp", true ) ).
                 validate();
 
 
@@ -72,14 +77,12 @@ public void removeTarget() throws IOException, ExecutionException, InterruptedEx
         AbstractBuild<?, ?> build2 = crrule.buildProject( project.getJenkinsProject(), false, null );
 
         /* Verify second build */
-        FilePath path = new FilePath( project.getJenkinsProject().getLastBuiltOn().getWorkspaceFor( (FreeStyleProject)project.getJenkinsProject() ), "view/" + ccenv.getUniqueName() );
-        listPath( path );
         SystemValidator<ClearCaseUCMTarget> val2 = new SystemValidator<ClearCaseUCMTarget>( build2 );
         val2.checkExpectedResult( Result.SUCCESS ).
                 checkCompatability( true ).
                 checkTargets( new ClearCaseUCMTarget( "model-2@" + ccenv.getPVob() + ", INITIAL, false" ) ).
                 addElementToPathCheck( path, new SystemValidator.Element( "Model", true ) ).
-                addElementToPathCheck( path, new SystemValidator.Element( "Client", false ) ).
+                addElementToPathCheck( path, new SystemValidator.Element( "Clientapp", false ) ).
                 validate();
     }