#502 Updated new ForceFieldConfiguratorTest test class

Needs_Revision
closed
Daniel Szisz
master (162)
5
2012-10-08
2012-04-13
Daniel Szisz
No

I updated the new builder3d.ForceFieldConfiguratorTest class that I assembled and Egon revised. It is now updated with correct bug and Test annotations
and other additions.

Discussion

  • Rajarshi Guha
    Rajarshi Guha
    2012-04-16

    Doesn't apply to the latest 1.4.x branch

     
  • Daniel Szisz
    Daniel Szisz
    2012-04-16

    Would you please put it then into master? Other patches will soon follow.

     
  • Rajarshi Guha
    Rajarshi Guha
    2012-04-16

    Does not apply to latest master eithr

    guhar@nci-s073052-l:~/src/cdk [master*]$ git am -s ~/Downloads/0001-updated-ForceFieldConfiguratorTest-with-bug-annotati.patch
    Applying: updated ForceFieldConfiguratorTest with bug annotations
    /Users/guhar/src/cdk/.git/rebase-apply/patch:10: trailing whitespace.
    /* Copyright (C) 2000-2007 Christoph Steinbeck
    /Users/guhar/src/cdk/.git/rebase-apply/patch:11: trailing whitespace.
    * 2001-2007,2009 Egon Willighagen
    /Users/guhar/src/cdk/.git/rebase-apply/patch:41: trailing whitespace.
    *
    error: src/test/org/openscience/cdk/modeling/builder3d/ForceFieldConfiguratorTest.java: does not exist in index
    Patch failed at 0001 updated ForceFieldConfiguratorTest with bug annotations
    When you have resolved this problem run "git am --resolved".
    If you would prefer to skip this patch, instead run "git am --skip".
    To restore the original branch and stop patching run "git am --abort".

     
  • It could be that part of the patch was applied earlier already?

    Daniel, can you check if you can apply it to the latest master?

     
  • Daniel Szisz
    Daniel Szisz
    2012-04-23

    This track is now closed. It was redericted and applied in an other patch to master.