3 Commits

Author SHA1 Message Date
Neil McErlean
d6c28d0f2f Fixing a typo in test code. I accidentally put two @Rule annotations in when there only should have been one.
For the record, I think the presence of two of these @Rule annotations would mean that all @Test methods in this class would run inside *two* RunAs blocks instead of one. So wrong, but shouldn't have caused any problems.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 13:23:28 +00:00
Neil McErlean
9fbba5a5e0 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
54638: As part of work investigating ALF-19783 I have created a test case. I'm checking this in on 4.1 bugfix (where the issue is not reported)
Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
   54640: (RECORD ONLY) (Part of prep work for ALF-19783) Moving a test class to the correct source tree.

Note that in doing the record-only merge above, the file ScriptNodeTest had been created on V4.1-BUG-FIX *and* on HEAD independently.
So I got a tree conflict in merging 54640 to HEAD as this attempted to svn mv ScriptNodeTest on top of HEAD's existing copy of that file.
So instead, I manually resolved the conflict by merging the two files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 13:15:35 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00