--- a/landingpage/index.html +++ b/landingpage/index.html @@ -29,12 +29,12 @@ <div class="collapse navbar-collapse navbar-ex1-collapse"> <ul class="nav navbar-nav navbar-right"> + <li><a href="#jumbotron" class="nav-link">About</a></li> <li><a href="#features" class="nav-link">Features</a></li> <li><a href="#tour-head" class="nav-link">Tour</a></li> <li><a href="#Download">Download</a></li> <li><a href="#start" class="nav-link">Getting started</a></li> - <li><a href="#tuturial" class="nav-link">Tutorial</a></li> - <li><a href="#about" class="nav-link">About</a></li> + <li><a href="#Resources" class="nav-link">Resources</a></li> </ul> </div> <!-- /.navbar-collapse --> </div> <!-- /.container --> @@ -43,10 +43,21 @@ <div id="top" class="jumbotron"> <div class="container"> - <h1>CfUnit — CODESYS Forge Unit Testing framework</h1> - <h2>'CfUnit' is motivated by absence of 'good and free' open source IEC61131-3 automated unit-testing solutions. Developed in ST for CODESYS based PLC systems. MIT-Licensed</h2> - <p><a class="btn btn-primary btn-lg" href="#Download">Download <span class="glyphicon glyphicon-circle-arrow-right"></span></a></p> - </div> <!-- /.container --> + <h1> + CfUnit — CODESYS Forge Unit Testing framework + </h1> + <h2> + 'CfUnit' is motivated by absence of 'good and free' open source IEC61131-3 automated unit-testing solutions. + Written in Structured-Text for CODESYS based PLC systems. MIT-licensed. + </h2> + <p><a class="btn btn-primary btn-lg" href="#Download">Download <span class="glyphicon glyphicon-circle-arrow-right"></span></a></p> + <br> + <h4> + Forked from <a href="https://www.tcunit.org">TcUnit</a> by Jakob Sagatowski for TwinCAT3. Assistance provided + by zer0g & Ingo was greatly appreciated. Without their assistance, porting alone would have taken me several + months. Kudos for helping me out with various tickets and providing invalueable feedback! + <h4> + </div> <!-- /.container --> </div> <!-- /.jumbotron --> @@ -101,25 +112,25 @@ <div class="item"> <img src="img/TestSuite.png"> <div class="carousel-caption d-md-block"> - Step 2: Define a Test Suite + Step 2: Define Test Suite(s) </div> </div> <div class="item"> <img src="img/TestMethod.png"> <div class="carousel-caption d-md-block"> - Step 3: Define Test Method + Step 3: Define Test Method(s) </div> </div> <div class="item"> <img src="img/programcall.png"> <div class="carousel-caption d-md-block"> - Step 4: Define Program and call TestSuite + Step 4: Define TestProgram, call Test Suite </div> </div> <div class="item"> <img src="img/SimpleCfUnitExample.gif"> <div class="carousel-caption d-md-block"> - Step 5: Run Program and check TestLog + Step 5: Run TestProgram and check TestLog </div> </div> </div> @@ -134,92 +145,67 @@ </div> <!-- /.row --> </div> <!-- /.container --> </div> <!-- /.container-alternate --> - - + + <div class="container"> <h3 id="Download" class="subhead">Download</h3> - <div class="row download"> - <p class="col-md-4 col-sm-6"> - - </p> - <p> - <ul class="col-md-4 col-sm-6"> - <strong>Contains all you need:</strong> - <ul> - <li>CfUnit v1.0.0.0 Library</li> - <li>Verifier Project</li> - <li>Simple Example Project</li> - </ul><br> - <center> - <a href="https://forge.codesys.com/prj/cfunit/code/HEAD/tree/tags/v1.0.0.0/CfUnit.package?format=raw" class="btn btn-primary">Download Package</a> - </center> - </p> + <div class="row download" > + <p> + <ul class="col-md-4 col-sm-6 text-center"> + <p> + <a href="https://forge.codesys.com/prj/cfunit/code/HEAD/tree/tags/v1.0.0.0/CfUnit.package?format=raw" class="btn btn-primary">CfUnit v1.0.0.0 Package</a> + </p> + <strong>Contains</strong> + <br>CfUnit Library + <br>Verifier Project + <br>Simple Example Project + </p> </div> <!-- /.row Download --> - </div> <!-- /.container --> - - - <div class="container"> + + + </div> <!-- /.container --> + <div class="container"> <h3 id="start" class="subhead">Getting started</h3> - <div class="row start" align="center"> - <div class="col-md-10 col-md-offset-1"> - <ul> - <li>Extend your test with <code>CfUnit.FB_TestSuite</code>,</li> - <li>Add the attribute-pragma <code>{attribute ‘call_after_init’}</code>,</li> - <li>Define the inputs and define the expected output (result),</li> - <li>Call the CfUnit-assert methods to compare the expected output to the actual output,</li> - <li>Close the test with <code>TEST_FINISHED()</code> when finished.</li> - <li>Call the test method from the main FB Body</li> - </ul> - </div> + <div class="row start" > + <p> + <ul class="col-md-4 col-sm-6 text-center"> + <strong>A detailed step by step tutorial for the Simple CfUnit example project can be found <a href="https://forge.codesys.com/prj/cfunit/home/Home/">here</a>.</strong> + <br>Extend your test with <code>CfUnit.FB_TestSuite</code>, + <br>Add the attribute-pragma <code>{attribute ‘call_after_init’}</code>, + <br>Define the inputs and define the expected output (result), + <br>Call the CfUnit-assert methods to compare the expected output to the actual output,i> + <br>Close the test with <code>TEST_FINISHED()</code> when finished. + <br>Call the test method from the main FB Body + </p> + </div> </div> <!-- /.start --> </div> <!-- /.container --> - + + <div class="container"> - <h3 id="tuturial" class="subhead">Tutorial</h3> - <div class="row tutorial"> + <h3 id="Resources" class="subhead">Resources</h3> + <div class="row Resources"> <div class="col-md-10 col-md-offset-1 text-center"> - </p> - A step by step tutorial for the Simple CfUnit example project can be <a href="https://forge.codesys.com/prj/cfunit/home/Home/">found here.</a> - </p> <p class="col-md-4 col-sm-6"> <strong>API</strong><br> - Online API reference can be <a href="https://forge.codesys.com/prj/cfunit/home/CfUnit%20API%20Reference/"> found here</a>. + Online API reference can be found <a href="https://forge.codesys.com/prj/cfunit/home/CfUnit%20API%20Reference/">here</a>. </p> <p class="col-md-4 col-sm-6"> <strong>Q&A</strong><br> - If you have any questions, you can drop <a href="https://forge.codesys.com/prj/cfunit/questions/">them here</a>.<br> + If you have any questions, you can drop them <a href="https://forge.codesys.com/prj/cfunit/questions/">here</a>.<br> If you cannot find your anwser, you can always drop a question in the comment.<br> Posted questions will be modderated into the Q&A for future reference. </p> <p class="col-md-4 col-sm-6"> <strong>Bugs</strong><br> - Bugs can be reported by opening a <a href="https://forge.codesys.com/prj/cfunit/tickets/">ticket here</a>. + Bugs can be reported by opening a ticket <a href="https://forge.codesys.com/prj/cfunit/tickets/">here</a>. </p> </div> <!-- /.col-md-10 --> </div> <!-- /.row --> - </div> <!-- /.tutorial --> + </div> <!-- /.Resources --> </div> <!-- /.container --> - - <div class="container-alternate"> - <div class="container"> - <h3 id="about" class="subhead">About</h3> - <div class="row about"> - <div class="col-md-10 col-md-offset-1 text-center"> - </p> - Kudos to Jakob Sagatowski for his kind permission to port his testing framework to CODESYS. - Assistance provided by zer0g & Ingo was greatly appreciated. Without their assistance the porting alone would have taken me several months. - Kudos for helping out with various tickets and providing valueable feedback! - </p> - <p> - Forked and ported from <a href="https://www.tcunit.org">TcUnit</a>, originally written for TwinCAT3 by Jakob Sagatowski. - <p> - </div> <!-- /.col-md-10 --> - </div> <!-- /.row --> - </div> <!-- /.container --> - </div> <!-- /.container-alternate --> - - + <br> <footer> <div class="container clearfix"> <p class="pull-left"> @@ -242,6 +228,5 @@ link.closest(".navbar").find(".navbar-toggle:not(.collapsed)").click(); }); </script> - </body> </html>