Forum Discussion

william_roe's avatar
william_roe
Super Contributor
10 years ago

Sharing Project File While Designing

We are trying to design tests using a share project file (pjs) on the server but battling conflicts between developers. It seems to happen if a node is enabled or disabled or a new name mapping is created which is causing work to be lost. What is the best practice for multi-user to design tests? How do share name mapping?
  • Marsha_R's avatar
    Marsha_R
    10 years ago
    Our whole project is in Subversion and we each check out our own copy.



    If I add or change a keyword test, I add it to Subversion or check it in on my own and let the group know.  Whoever needs the test can update to get a new copy.



    For the name mapping, there is a Merge with function in TestComplete.  

    http://support.smartbear.com/viewarticle/55712/



    I give a copy of my name mapping file to the lucky person who gets to do the merge this week.  All updated name mapping files are merged in one at a time and conflicts are resolved on the one local machine.  That person checks the final file back into subversion and we each update ours from there.





  • Marsha_R's avatar
    Marsha_R
    Moderator
    10 years ago
    The name mapping file is NameMapping.tcNM



    Look in your project for a folder called Name Mapping that's on the same level as your Keyword Tests folder.  The name mapping file should be in there.
  • Marsha_R's avatar
    Marsha_R
    Moderator
    10 years ago
    Our whole project is in Subversion and we each check out our own copy.



    If I add or change a keyword test, I add it to Subversion or check it in on my own and let the group know.  Whoever needs the test can update to get a new copy.



    For the name mapping, there is a Merge with function in TestComplete.  

    http://support.smartbear.com/viewarticle/55712/



    I give a copy of my name mapping file to the lucky person who gets to do the merge this week.  All updated name mapping files are merged in one at a time and conflicts are resolved on the one local machine.  That person checks the final file back into subversion and we each update ours from there.





  • Marsha_R's avatar
    Marsha_R
    Moderator
    10 years ago
    Our data sheets live in subversion too and get checked out along with the code.  Everyone has their own copy and can check in/out as necessary.



    For merging the name mapping, if you have a conflict that needs to be fixed manually, you have to go hunting for it.  At the bottom of that article, look for Searching and Replacing in Name Mapping Editor.  Look for _new and that will find the items in question.



    Anything else was merged according to the rules in that article and you don't have to do anything.



    Since you ran successfully, you may not have anything that needs fixing, but you might want to do the search anyway just to tidy things up.
  • Marsha_R's avatar
    Marsha_R
    Moderator
    10 years ago
    We work with separate copies of project files and name mapping to avoid the conflicts.  



    Project files we never check in, but if a setting or variable is updated, we share that information with the group.  



    Name mapping we merge, but only once a week or so when changes are being made.  One person gets copies of all the different name mappings and merges them one at a time, then tests the merged copy and checks it in.  Everyone else updates after that.  
  • william_roe's avatar
    william_roe
    Super Contributor
    10 years ago
    Thanks for the reply.



    Do I have this staight... you have the project file (mds) on your local machine which points to the test files (tcKDTest) on the server?



    How do you merge the name mapping?



  • william_roe's avatar
    william_roe
    Super Contributor
    10 years ago
    Do you also put the spreadsheet containing the data driven values on the shared machine?
  • william_roe's avatar
    william_roe
    Super Contributor
    10 years ago
    When I merge two name mappings I recieve the following:



    Name conflicts detected. Please check whether the generated results are valid.



    I was expecting to see screens similar to  http://support.smartbear.com/viewarticle/55712/ in which I could choose the mapping(s) to merge.



    I was able to sucessfully run the newly merged mapping. 



    Am I missing something?