Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop with feature-testability branch #78

Merged
merged 90 commits into from Jun 6, 2012
Merged

Merge develop with feature-testability branch #78

merged 90 commits into from Jun 6, 2012

Commits on Dec 14, 2010

  1. Added initial service controller test. Fixed auth action for testabil…

    …ity (return instead of exit). Exit approach seemed to be broken in this case, since always a 200 HTTP status code was returned.
    pfrischmuth committed Dec 14, 2010
    Configuration menu
    Copy the full SHA
    2801295 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2010

  1. Issue 947: Reset the navigation singleton on every bootstrap; load co…

    …mponent helper classes iff not already available
    pfrischmuth committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    4cd1451 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b814986 View commit details
    Browse the repository at this point in the history
  3. - add: make section for easier use of phpunit (make test and go!)

    - add: TestSuite which contains the TestCases
    k00ni committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    45840b5 View commit details
    Browse the repository at this point in the history
  4. - add: TestSuite

    k00ni committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    fb69720 View commit details
    Browse the repository at this point in the history
  5. - chg: Update Zend Framework Version from 1.9.4 to 1.11.1 (contains a…

    … bugfix which is needed for UnitTesting)
    k00ni committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    ea65cd2 View commit details
    Browse the repository at this point in the history
  6. - chg: Add if's before constant definitions because of PHPUnit which …

    …tries to re-define the constants -> errors
    k00ni committed Dec 15, 2010
    Configuration menu
    Copy the full SHA
    157da22 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2010

  1. - add: 2 tests for sparqlAction

    - add: missing HttpResponseCodes
    - add: try catch during questioning the model because of a possible Erfurt_Ac_Exception exception
    - del: some exits
    k00ni committed Dec 16, 2010
    Configuration menu
    Copy the full SHA
    41f3f4c View commit details
    Browse the repository at this point in the history
  2. - del: Test var_dump

    k00ni committed Dec 16, 2010
    Configuration menu
    Copy the full SHA
    e5a85cd View commit details
    Browse the repository at this point in the history
  3. + erfurt test target

    seebi committed Dec 16, 2010
    Configuration menu
    Copy the full SHA
    2d4abf3 View commit details
    Browse the repository at this point in the history
  4. + Zend path

    seebi committed Dec 16, 2010
    Configuration menu
    Copy the full SHA
    547d55d View commit details
    Browse the repository at this point in the history
  5. Started refactoring of test environment: renamed test_base to TestHel…

    …per, Modified ServiceControllerTest to enable direct execution; Needs to be documented
    pfrischmuth committed Dec 16, 2010
    Configuration menu
    Copy the full SHA
    3657fc8 View commit details
    Browse the repository at this point in the history
  6. Modified index controller test to include TestHelper; removed hashban…

    …g, since it was echoed, when test suite is executed
    pfrischmuth committed Dec 16, 2010
    Configuration menu
    Copy the full SHA
    3fe7ff4 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2010

  1. Configuration menu
    Copy the full SHA
    a36ac06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e0d5e54 View commit details
    Browse the repository at this point in the history
  3. merge with default

    pfrischmuth committed Dec 17, 2010
    Configuration menu
    Copy the full SHA
    73d3157 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7004e15 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6a4cbf1 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2010

  1. - chg: rename sparqlNoAuthWithQuery to sparqlNoAuthWithInvalidQuery

    - add: sparqlAction-Test with Query "SELECT ?s WHERE { ?s ?p ?o. }" => Result as XML (#1)
    - add: sparqlAction-Test with Query "SELECT ?s WHERE { ?s ?p ?o. }" => Result as JSON (#2)
    - both Tests #1 and #2 are questioning an empty/not existable/invisible knowledge base and getting no result, right?
    k00ni committed Dec 19, 2010
    Configuration menu
    Copy the full SHA
    5749721 View commit details
    Browse the repository at this point in the history
  2. - add: OntoWiki_TestSuite

    - add: OntoWiki_TestSuite to tests/TestSuite.php
    - port: OntoWiki/MessageTest.php into new Test-System
    - add: MessageTest to OntoWiki_TestSuite
    k00ni committed Dec 19, 2010
    Configuration menu
    Copy the full SHA
    d0133a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41be23a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3ca7732 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2010

  1. Configuration menu
    Copy the full SHA
    fbadd12 View commit details
    Browse the repository at this point in the history
  2. Test for index/news action; Cleaned up news action; now shows warning…

    … message if feed loading fails.
    pfrischmuth committed Dec 20, 2010
    Configuration menu
    Copy the full SHA
    d3a0ddc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0aa7162 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4a70a12 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2010

  1. merge with default

    pfrischmuth committed Dec 21, 2010
    Configuration menu
    Copy the full SHA
    ec86180 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    02f19b1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5aadd86 View commit details
    Browse the repository at this point in the history
  4. merge with default

    pfrischmuth committed Dec 21, 2010
    Configuration menu
    Copy the full SHA
    ad8e870 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    56fc86f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f2fca3c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    00c4b1e View commit details
    Browse the repository at this point in the history
  8. Modified semanticsitemap extension to fit new OntoWiki_Version; Added…

    … OntoWiki::APPLICATION_NAME constant.
    pfrischmuth committed Dec 21, 2010
    Configuration menu
    Copy the full SHA
    f556036 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1690dcd View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2010

  1. Configuration menu
    Copy the full SHA
    ecbf0da View commit details
    Browse the repository at this point in the history
  2. merge with default

    pfrischmuth committed Dec 22, 2010
    Configuration menu
    Copy the full SHA
    ff2247c View commit details
    Browse the repository at this point in the history
  3. merge with default

    pfrischmuth committed Dec 22, 2010
    Configuration menu
    Copy the full SHA
    c97241f View commit details
    Browse the repository at this point in the history
  4. Current state of fixing multiple bootstrapping support. Multiple boot…

    …strapping of extension manager still fails, since multiple module registration fails.
    pfrischmuth committed Dec 22, 2010
    Configuration menu
    Copy the full SHA
    b544d8f View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2010

  1. Configuration menu
    Copy the full SHA
    5482a6f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9ed9871 View commit details
    Browse the repository at this point in the history
  3. - add: if before define constant EXTENSION_PATH and _OWSESSION. Cause…

    … there are errors during tests if not.
    k00ni committed Dec 23, 2010
    Configuration menu
    Copy the full SHA
    679d637 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2010

  1. Configuration menu
    Copy the full SHA
    23cf1d4 View commit details
    Browse the repository at this point in the history
  2. merge

    pfrischmuth committed Dec 24, 2010
    Configuration menu
    Copy the full SHA
    daa7efe View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2011

  1. Merged with default

    0xfeedface committed Feb 1, 2011
    Configuration menu
    Copy the full SHA
    a5b9dd0 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2011

  1. Configuration menu
    Copy the full SHA
    0ec01e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e4ceccb View commit details
    Browse the repository at this point in the history

Commits on May 17, 2011

  1. test mods

    pfrischmuth committed May 17, 2011
    Configuration menu
    Copy the full SHA
    f9efb9d View commit details
    Browse the repository at this point in the history

Commits on May 19, 2011

  1. merge with default

    pfrischmuth committed May 19, 2011
    Configuration menu
    Copy the full SHA
    ba784ee View commit details
    Browse the repository at this point in the history
  2. merge local heads

    pfrischmuth committed May 19, 2011
    Configuration menu
    Copy the full SHA
    4018da6 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2011

  1. - add: Makefile options to install/uninstall/enable/disable the codes…

    …niffer
    
    - add: Makefile options to check all files or only commit files with the codesniffer
    - add: codesniffer folder with the ontowiki coding standard
    - add: two scripts to manipulate the hgrc file (add/remove codesniffer precommit hook)
    larseidam committed Jun 1, 2011
    Configuration menu
    Copy the full SHA
    413d649 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2011

  1. - chg: hook to check only php files

    - chg: adjust Ontowiki standard
    - chg: sniff php files to accepted by the Ontowiki standard
    - chg: makefile to check only php files
    larseidam committed Jun 11, 2011
    Configuration menu
    Copy the full SHA
    88a2d11 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2011

  1. - chg: syntaxerror -> one curved bracket too much in line 260

    - chg: all other changes are to fulfill the coding standards
    larseidam committed Jun 20, 2011
    Configuration menu
    Copy the full SHA
    584ca81 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2011

  1. merge default (2562)

    larseidam committed Jul 5, 2011
    Configuration menu
    Copy the full SHA
    12bb4ab View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2011

  1. Configuration menu
    Copy the full SHA
    70fc7d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2011

  1. - add: variables in makefile to easy config the code sniffer

    - chg: only one place for config variable in the makefile, so no need to edit
    > the 'add-hook' script to chance the severity or something like that
    larseidam committed Jul 11, 2011
    Configuration menu
    Copy the full SHA
    304ce99 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2011

  1. - merge: default

    larseidam committed Jul 18, 2011
    Configuration menu
    Copy the full SHA
    35ed955 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2011

  1. Merge with default

    larseidam committed Sep 14, 2011
    Configuration menu
    Copy the full SHA
    a33d4df View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2011

  1. merge with default

    seebi committed Sep 23, 2011
    Configuration menu
    Copy the full SHA
    0627481 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2011

  1. Merge branch 'master' into feature/testability

    Conflicts:
    	Makefile
    seebi committed Sep 24, 2011
    Configuration menu
    Copy the full SHA
    7e81f31 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2012

  1. Check if _OWDEBUG was already defined

    Neccessary for re-instancing an OntoWiki in PHPUnit,
    without it you'll get a warning
    k00ni committed May 29, 2012
    Configuration menu
    Copy the full SHA
    283a931 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f49a383 View commit details
    Browse the repository at this point in the history
  3. Merge feature-testability into develop

    - Zend 1.x requires PHPUnit 3.5.x, otherwise you will
      get a warning:
    
      Declaration of Zend_Test_PHPUnit_Constraint_ResponseHeader::evaluate()
      should be compatible with that of PHPUnit_Framework_Constraint::evaluate()
    
    - many classes were removed in the develop branch, so i did the same during
      merging and adapt the tests (remove some):
    
      - e.g. OntoWiki/Component/Manager.php
    
    - Lots of tests are broken because of
      - missing functions
      - changed function behavior
      - changed function parameters
    
      i fix some, uncomment some and there still some which produces errors
    
    - adapt whole test environment and "make test"
    
      No TestSuites, only TestCases
    k00ni committed May 29, 2012
    4 Configuration menu
    Copy the full SHA
    573181e View commit details
    Browse the repository at this point in the history
  4. Replace all exit's with replace's and add make test-extensions command

    - An exit stops PHPUnit
    
    - make test-extensions: to test all extensions which have test cases
    is still incomplete/broken! Many errors, warnings, ...
    k00ni committed May 29, 2012
    Configuration menu
    Copy the full SHA
    fec2f7f View commit details
    Browse the repository at this point in the history

Commits on May 30, 2012

  1. Dirty workaround to make it possible using TitleHelper instances in t…

    …est cases
    
    It is still temporary and should be replace by
    clear version as soon as possible!
    k00ni committed May 30, 2012
    Configuration menu
    Copy the full SHA
    b0b3b32 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' of github.com:AKSW/OntoWiki into develop

    Conflicts:
    	application/controllers/ResourceController.php
    k00ni committed May 30, 2012
    Configuration menu
    Copy the full SHA
    4f41d02 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2012

  1. Merge branch 'develop' of github.com:AKSW/OntoWiki into develop

    Conflicts:
    	extensions/queries/lib/SPARQLExecuter.php
    k00ni committed Jun 4, 2012
    Configuration menu
    Copy the full SHA
    1c1de6a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ab97b23 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e27441 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    503ba9d View commit details
    Browse the repository at this point in the history
  5. In MessageTest.php, throw out main method and add a dummy test functi…

    …on to prevent PHPUnit from throwing an error
    k00ni committed Jun 4, 2012
    Configuration menu
    Copy the full SHA
    36bfea4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8f1ef31 View commit details
    Browse the repository at this point in the history
  7. Styling the Makefile menus

    And moving CodeSniffer related stuff to help-cs section
    k00ni committed Jun 4, 2012
    Configuration menu
    Copy the full SHA
    cd49f17 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c09cfd7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c455264 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2012

  1. Merge branch 'develop' of github.com:AKSW/OntoWiki into develop

    Conflicts:
    	application/tests/OntoWiki/InstancesTest.php
    	extensions/history/HistoryController.php
    	extensions/queries/QueriesController.php
    k00ni committed Jun 5, 2012
    Configuration menu
    Copy the full SHA
    8fe5061 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    76e767e View commit details
    Browse the repository at this point in the history
  3. Move InstancesTest.php

    k00ni committed Jun 5, 2012
    Configuration menu
    Copy the full SHA
    c4c4f7d View commit details
    Browse the repository at this point in the history
  4. Some code niceups

    k00ni committed Jun 5, 2012
    Configuration menu
    Copy the full SHA
    b875c5b View commit details
    Browse the repository at this point in the history
  5. Change OntoWiki_Navigation to a non-static class

    Add a test case for the class
    k00ni committed Jun 5, 2012
    Configuration menu
    Copy the full SHA
    99824d7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    38b3b71 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'develop' of github.com:AKSW/OntoWiki into refactor-onto…

    …wiki_navigation
    
    Conflicts:
    	application/classes/OntoWiki/Model/Instances.php
    	application/classes/OntoWiki/Model/TitleHelper.php
    	application/tests/OntoWiki/Model/InstancesTest.php
    
    And reactivate most of the 56 old tests.
    k00ni committed Jun 5, 2012
    Configuration menu
    Copy the full SHA
    083f874 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0146818 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2012

  1. Fixes for controller test cases

    Philipp Frischmuth committed Jun 6, 2012
    Configuration menu
    Copy the full SHA
    1557701 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4cfcd07 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4741938 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8e4730c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    843de2a View commit details
    Browse the repository at this point in the history
  6. Fix auth and sparql Actions of ServiceController

    - add response codes for sparql Action
    - fix undefined $logout warning
    - in ServiceControllerTest the username/password to u/p
    - comment out ServiceControllerTest->testAuthActionInvalidUser
    k00ni committed Jun 6, 2012
    Configuration menu
    Copy the full SHA
    bc4a83e View commit details
    Browse the repository at this point in the history
  7. Enabled testMethod again; updated Erfurt submodule

    Philipp Frischmuth committed Jun 6, 2012
    Configuration menu
    Copy the full SHA
    043f5cc View commit details
    Browse the repository at this point in the history