From 756f30146091d0383566b5291a85cc6c4198869b Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 19 Jul 2011 12:05:29 +0200 Subject: removed files that should not be checked in --- lib/eunit/AUTHORS | 2 - lib/eunit/doc/.gitignore | 4 + lib/eunit/doc/edoc-info | 3 - lib/eunit/doc/erlang.png | Bin 2109 -> 0 bytes lib/eunit/doc/eunit.html | 71 --- lib/eunit/doc/eunit_surefire.html | 78 --- lib/eunit/doc/index.html | 17 - lib/eunit/doc/modules-frame.html | 13 - lib/eunit/doc/overview-summary.html | 1032 ----------------------------------- lib/eunit/doc/packages-frame.html | 11 - lib/eunit/doc/stylesheet.css | 55 -- 11 files changed, 4 insertions(+), 1282 deletions(-) delete mode 100644 lib/eunit/AUTHORS create mode 100644 lib/eunit/doc/.gitignore delete mode 100644 lib/eunit/doc/edoc-info delete mode 100644 lib/eunit/doc/erlang.png delete mode 100644 lib/eunit/doc/eunit.html delete mode 100644 lib/eunit/doc/eunit_surefire.html delete mode 100644 lib/eunit/doc/index.html delete mode 100644 lib/eunit/doc/modules-frame.html delete mode 100644 lib/eunit/doc/overview-summary.html delete mode 100644 lib/eunit/doc/packages-frame.html delete mode 100644 lib/eunit/doc/stylesheet.css diff --git a/lib/eunit/AUTHORS b/lib/eunit/AUTHORS deleted file mode 100644 index b7c1426aff..0000000000 --- a/lib/eunit/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Richard Carlsson -Mickaël Rémond diff --git a/lib/eunit/doc/.gitignore b/lib/eunit/doc/.gitignore new file mode 100644 index 0000000000..7fcda5db42 --- /dev/null +++ b/lib/eunit/doc/.gitignore @@ -0,0 +1,4 @@ +*.html +stylesheet.css +erlang.png +edoc-info diff --git a/lib/eunit/doc/edoc-info b/lib/eunit/doc/edoc-info deleted file mode 100644 index 1c04b2ed1a..0000000000 --- a/lib/eunit/doc/edoc-info +++ /dev/null @@ -1,3 +0,0 @@ -{application,eunit}. -{packages,[]}. -{modules,[eunit,eunit_surefire]}. diff --git a/lib/eunit/doc/erlang.png b/lib/eunit/doc/erlang.png deleted file mode 100644 index 987a618e24..0000000000 Binary files a/lib/eunit/doc/erlang.png and /dev/null differ diff --git a/lib/eunit/doc/eunit.html b/lib/eunit/doc/eunit.html deleted file mode 100644 index a181d12ce3..0000000000 --- a/lib/eunit/doc/eunit.html +++ /dev/null @@ -1,71 +0,0 @@ - - - -Module eunit - - - -
Overviewerlang logo
-
- -

Module eunit

-This module is the main EUnit user interface. -

Copyright © 2004-2009 Mickaël Rémond, Richard Carlsson

- -

Version: 2.1.1, Apr 22 2009 22:37:19

-

Authors: Mickaël Rémond (mickael.remond@process-one.net) [web site: http://www.process-one.net/], Richard Carlsson (richardc@it.uu.se) [web site: http://user.it.uu.se/~richardc/].

- -

Description

This module is the main EUnit user interface. -

Function Index

- - - - -
start/0Starts the EUnit server.
stop/0Stops the EUnit server.
test/1Equivalent to test(Tests, []). -
test/2Runs a set of tests.
- -

Function Details

- -

start/0

-
-

start() -> any()

-

Starts the EUnit server. Normally, you don't need to call this - function; it is started automatically.

- -

stop/0

-
-

stop() -> any()

-

Stops the EUnit server. Normally, you don't need to call this - function.

- -

test/1

-
-

test(Tests) -> any()

-

Equivalent to test(Tests, []).

- - -

test/2

-
-

test(Tests::term(), Options::[term()]) -> ok | {error, term()}

-

Runs a set of tests. The format of Tests is described in the - section EUnit test - representation of the overview.

- - Example: 
  eunit:test(fred)

runs all tests in the module fred - and also any tests in the module fred_tests, if that module exists.

- - Options: -
-
verbose
-
Displays more details about the running tests.
-
- - Options in the environment variable EUNIT are also included last in - the option list, i.e., have lower precedence than those in Options.

-

See also: test/1.

-
- -
Overviewerlang logo
-

Generated by EDoc, Apr 22 2009, 22:37:19.

- - diff --git a/lib/eunit/doc/eunit_surefire.html b/lib/eunit/doc/eunit_surefire.html deleted file mode 100644 index f2ecbae572..0000000000 --- a/lib/eunit/doc/eunit_surefire.html +++ /dev/null @@ -1,78 +0,0 @@ - - - -Module eunit_surefire - - - -
Overviewerlang logo
-
- -

Module eunit_surefire

-Surefire reports for EUnit (Format used by Maven and Atlassian -Bamboo for example to integrate test results). -

Copyright © 2009 Mickaël Rémond, Paul Guyot

- -

Behaviours: eunit_listener.

-

Authors: Mickaël Rémond (mremond@process-one.net).

-

See also: eunit.

- -

Description

Surefire reports for EUnit (Format used by Maven and Atlassian -Bamboo for example to integrate test results). Based on initial code -from Paul Guyot.

- - Example: Generate XML result file in the current directory: - 
     eunit:test([fib, eunit_examples],
-                [{report,{eunit_surefire,[{dir,"."}]}}]).
-

Function Index

- - - - - - - -
handle_begin/3
handle_cancel/3
handle_end/3
init/1
start/0
start/1
terminate/2
- -

Function Details

- -

handle_begin/3

-
-

handle_begin(X1, Data, St) -> any()

-
- -

handle_cancel/3

-
-

handle_cancel(X1, Data, St) -> any()

-
- -

handle_end/3

-
-

handle_end(X1, Data, St) -> any()

-
- -

init/1

-
-

init(Options) -> any()

-
- -

start/0

-
-

start() -> any()

-
- -

start/1

-
-

start(Options) -> any()

-
- -

terminate/2

-
-

terminate(X1, St) -> any()

-
-
- -
Overviewerlang logo
-

Generated by EDoc, Apr 22 2009, 22:37:19.

- - diff --git a/lib/eunit/doc/index.html b/lib/eunit/doc/index.html deleted file mode 100644 index 9bd8e8cf6b..0000000000 --- a/lib/eunit/doc/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -The eunit application - - - - - - -<h2>This page uses frames</h2> -<p>Your browser does not accept frames. -<br>You should go to the <a href="overview-summary.html">non-frame version</a> instead. -</p> - - - \ No newline at end of file diff --git a/lib/eunit/doc/modules-frame.html b/lib/eunit/doc/modules-frame.html deleted file mode 100644 index a484e99d4c..0000000000 --- a/lib/eunit/doc/modules-frame.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -The eunit application - - - -

Modules

- - -
eunit
eunit_surefire
- - \ No newline at end of file diff --git a/lib/eunit/doc/overview-summary.html b/lib/eunit/doc/overview-summary.html deleted file mode 100644 index ea7beba8b3..0000000000 --- a/lib/eunit/doc/overview-summary.html +++ /dev/null @@ -1,1032 +0,0 @@ - - - -EUnit - a Lightweight Unit Testing Framework for Erlang - - - - -
Overviewerlang logo
-

EUnit - a Lightweight Unit Testing Framework for Erlang -

-

Copyright © 2004-2007 Mickaël Rémond, Richard Carlsson

-

Version: 2.1.1, Apr 22 2009 22:37:19 -

-

Authors: Richard Carlsson (richardc@it.uu.se) [web site: http://user.it.uu.se/~richardc/], Mickaël Rémond (mickael.remond@process-one.net) [web site: http://www.process-one.net/].

-

EUnit is a unit testing framework for Erlang. It is very powerful -and flexible, is easy to use, and has small syntactical overhead.

- - - -

EUnit builds on ideas from the family of unit testing frameworks for -Object Oriented languages that originated with JUnit by Beck and Gamma -(and Beck's previous framework SUnit for Smalltalk). However, EUnit uses -techniques more adapted to functional and concurrent programming, and is -typically less verbose than its relatives.

- -

Although EUnit uses many preprocessor macros, they have been designed to -be as nonintrusive as possible, and should not cause conflicts with -existing code. Adding EUnit tests to a module should thus not normally -require changing existing code. Furthermore, tests that only exercise -the exported functions of a module can always be placed in a completely -separate module, avoiding any conflicts entirely.

- -

Unit testing

- -

Unit Testing is testing of individual program "units" in relative -isolation. There is no particular size requirement: a unit can be a -function, a module, a process, or even a whole application, but the most -typical testing units are individual functions or modules. In order to -test a unit, you specify a set of individual tests, set up the smallest -necessary environment for being able to run those tests (often, you -don't need to do any setup at all), you run the tests and collect the -results, and finally you do any necessary cleanup so that the test can -be run again later. A Unit Testing Framework tries to help you in each -stage of this process, so that it is easy to write tests, easy to run -them, and easy to see which tests failed (so you can fix the bugs).

- -

Advantages of unit testing

- -
-
Reduces the risks of changing the program
-
Most programs will be modified during their lifetime: bugs will be - fixed, features will be added, optimizations may become necessary, or - the code will need to be refactored or cleaned up in other ways to - make it easier to work with. But every change to a working program is - a risk of introducing new bugs - or reintroducing bugs that had - previously been fixed. Having a set of unit tests that you can run - with very little effort makes it easy to know that the code still - works as it should (this use is called regression testing; - see Terminology). This goes a long way to reduce the - resistance to changing and refactoring code.
-
Helps guide and speed up the development process
-
By focusing on getting the code to pass the tests, the programmer - can become more productive, not overspecify or get lost in premature - optimizations, and create code that is correct from the very beginning - (so-called test-driven development; see Terminology).
-
Helps separate interface from implementation
-
When writing tests, the programmer may discover dependencies - (in order to get the tests to run) that ought not to be there, and - which need to be abstracted away to get a cleaner design. This helps - eliminate bad dependencies before they spread throughout the - code.
-
Makes component integration easier
-
By testing in a bottom-up fashion, beginning with the smallest - program units and creating a confidence in that they work as they - should, it becomes easier to test that a higher-level component, - consisting of several such units, also behaves according to - specification (known as integration testing; see Terminology).
-
Is self-documenting
-
The tests can be read as documentation, typically showing both - examples of correct and incorrect usage, along with the expected - consequences.
-
- -

Terminology

- -
-
Unit testing
-
Testing that a program unit behaves as it is supposed to do (in - itself), according to its specifications. Unit tests have an important - function as regression tests, when the program later is modified for - some reason, since they check that the program still behaves according - to specification.
-
Regression testing
-
Running a set of tests after making changes to a program, to check - that the program behaves as it did before the changes (except, of - course, for any intentional changes in behaviour). Unit tests are - important as regression tests, but regression testing can involve more - than just unit testing, and may also test behaviour that might not be - part of the normal specification (such as bug-for-bug-compatibility). -
-
Integration testing
-
Testing that a number of individually developed program units - (assumed to already have been separately unit tested) work together as - expected. Depending on the system being developed, integration testing - may be as simple as "just another level of unit testing", but might - also involve other kinds of tests (compare system testing). -
-
System testing
-
Testing that a complete system behaves according to its - specification. Specifically, system testing should not require knowing - any details about the implementation. It typically involves testing - many different aspects of the system behaviour apart from the basic - functionality, such as performance, usability, and reliability.
-
Test-driven development
-
A program development technique where you continuously write tests - before you implement the code that is supposed to pass those - tests. This can help you focus on solving the right problems, and not - make a more complicated implementation than necessary, by letting the - unit tests determine when a program is "done": if it fulfils its - specifications, there is no need to keep adding functionality.
-
Mock object
-
Sometimes, testing some unit A (e.g., a function) requires that - it collaborates somehow with some other unit B (perhaps being passed - as an argument, or by reference) - but B has not been implemented - yet. A "mock object" - an object which, for the purposes of testing - A, looks and behaves like a real B - might then be used instead. - (This is of course only useful if it would be significantly more work - to implement a real B than to create a mock object.)
-
Test case
-
A single, well-defined test, that somehow can be uniquely - identified. When executed, the test case either passes or - fails; the test report should identify exactly which test - cases failed.
-
Test suite
-
A collection of test cases, generally with a specific, common - target for testing, such as a single function, module, or subsystem. A - test suite may also be recursively composed by smaller test - suites.
-
- -

Getting started

- - -

Including the EUnit header file

- -The simplest way to use EUnit in an Erlang module is to add the -following line at the beginning of the module (after the -module -declaration, but before any function definitions): -
   -include_lib("eunit/include/eunit.hrl").
- -This will have the following effect: -
    -
  • Creates an exported function test() (unless testing is turned - off, and the module does not already contain a test() function), that - can be used to run all the unit tests defined in the module
    • -
  • Causes all functions whose names match ..._test() or ..._test_() - to be automatically exported from the module (unless testing is - turned off, or the EUNIT_NOAUTO macro is defined)
    • -
  • Makes all the preprocessor macros of EUnit available, to help - writing tests
    • -
- -Note: For -include_lib(...) to work, the Erlang -module search path must contain a directory whose name ends in -eunit/ebin (pointing to the ebin subdirectory of the EUnit -installation directory). If EUnit is installed as lib/eunit under your -Erlang/OTP system directory, its ebin subdirectory will be -automatically added to the search path when Erlang starts. Otherwise, -you need to add the directory explicitly, by passing a -pa flag to the -erl or erlc command. For example, a Makefile could contain the -following action for compiling .erl files: -
   erlc -pa "path/to/eunit/ebin" $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
-or if you want Eunit to always be available when you run Erlang -interactively, you can add a line like the following to your -$HOME/.erlang file: -
   code:add_path("/path/to/eunit/ebin").
- -

Writing simple test functions

- -

The EUnit framework makes it extremely easy to write unit tests in -Erlang. There are a few different ways of writing them, though, so we -start with the simplest:

- -

A function with a name ending in ..._test() is recognized by EUnit as -a simple test function - it takes no arguments, and its execution either -succeeds (returning some arbitrary value that EUnit will throw away), or -fails by throwing an exception of some kind (or by not terminating, in -which case it will be aborted after a while).

- -An example of a simple test function could be the following: -
   reverse_test() -> lists:reverse([1,2,3]).

-This just tests that the function lists:reverse(List) does not crash -when List is [1,2,3]. It is not a great test, but many people write -simple functions like this one to test the basic functionality of their -code, and those tests can be used directly by EUnit, without changes, -as long as their function names match.

- -
Use exceptions to signal failure
- -To write more interesting tests, we need to make them crash (throw an -exception) when they don't get the result they expect. A simple way of -doing this is to use pattern matching with =, as in the following -examples: -
   reverse_nil_test() -> [] = lists:reverse([]).
-   reverse_one_test() -> [1] = lists:reverse([1]).
-   reverse_two_test() -> [2,1] = lists:reverse([1,2]).

-If there was some bug in lists:reverse/1 that made it return something -other than [2,1] when it got [1,2] as input, then the last test -above would throw a badmatch error. The first two (we assume they do -not get a badmatch) would simply return [] and [1], respectively, -so both succeed. (Note that EUnit is not psychic: if you write a test -that returns a value, even if it is the wrong value, EUnit will consider -it a success. You must make sure that the test is written so that it -causes a crash if the result is not what it should be.)

- -
Using assert macros
- -If you want to use Boolean operators for your tests, the assert -macro comes in handy (see EUnit macros for details): -
   length_test() -> ?assert(length([1,2,3]) =:= 3).

-The ?assert(Expression) macro will evaluate Expression, and if that -does not evaluate to true, it will throw an exception; otherwise it -just returns ok. In the above example, the test will thus fail if the -call to length does not return 3.

- -

Running EUnit

- -

If you have added the declaration --include_lib("eunit/include/eunit.hrl") to your module, as described -above, you only need to compile the module, and run the automatically -exported function test(). For example, if your module was named m, -then calling m:test() will run EUnit on all the tests defined in the -module. You do not need to write -export declarations for the test -functions. This is all done by magic.

- -

You can also use the function eunit:test/1 to run arbitrary -tests, for example to try out some more advanced test descriptors (see -EUnit test representation). For example, running -eunit:test(m) does the same thing as the auto-generated function -m:test(), while eunit:test({inparallel, m}) runs the same test -cases but executes them all in parallel.

- -
Putting tests in separate modules
- -

If you want to separate your test code from your normal code (at least -for testing the exported functions), you can simply write the test -functions in a module named m_tests (note: not m_test), if your -module is named m. Then, whenever you ask EUnit to test the module -m, it will also look for the module m_tests and run those tests as -well. See ModuleName in the section Primitives for details.

- -
EUnit captures standard output
- -

If your test code writes to the standard output, you may be surprised to -see that the text does not appear on the console when the tests are -running. This is because EUnit captures all standard output from test -functions (this also includes setup and cleanup functions, but not -generator functions), so that it can be included in the test report if -errors occur. To bypass EUnit and print text directly to the console -while testing, you can write to the user output stream, as in -io:format(user, "~w", [Term]). The recommended way of doing this is to -use the EUnit Debugging macros, which make it much simpler.

- -

Writing test generating functions

- -

A drawback of simple test functions is that you must write a separate -function (with a separate name) for each test case. A more compact way -of writing tests (and much more flexible, as we shall see), is to write -functions that return tests, instead of being tests.

- -

A function with a name ending in ..._test_() (note the final -underscore) is recognized by EUnit as a test generator -function. Test generators return a representation of a set -of tests to be executed by EUnit.

- -
Representing a test as data
- -The most basic representation of a test is a single fun-expression that -takes no arguments. For example, the following test generator: -
   basic_test_() ->
-       fun () -> ?assert(1 + 1 =:= 2) end.
-will have the same effect as the following simple test: -
   simple_test() ->
-       ?assert(1 + 1 =:= 2).

-(in fact, EUnit will handle all simple tests just like it handles -fun-expressions: it will put them in a list, and run them one by one).

- -
Using macros to write tests
- -To make tests more compact and readable, as well as automatically add -information about the line number in the source code where a test -occurred (and reduce the number of characters you have to type), you can -use the _test macro (note the initial underscore character), like -this: -
   basic_test_() ->
-       ?_test(?assert(1 + 1 =:= 2)).

-The _test macro takes any expression (the "body") as argument, and -places it within a fun-expression (along with some extra information). -The body can be any kind of test expression, just like the body of a -simple test function.

- -
Underscore-prefixed macros create test objects
- -But this example can be made even shorter! Most test macros, such as the -family of assert macros, have a corresponding form with an initial -underscore character, which automatically adds a ?_test(...) wrapper. -The above example can then simply be written: -
   basic_test_() ->
-       ?_assert(1 + 1 =:= 2).

-which has exactly the same meaning (note the _assert instead of -assert). You can think of the initial underscore as signalling -test object.

- -

An example

- -Sometimes, an example says more than a thousand words. The following -small Erlang module shows how EUnit can be used in practice. -
   -module(fib).
-   -export([fib/1]).
-   -include_lib("eunit/include/eunit.hrl").
-
-   fib(0) -> 1;
-   fib(1) -> 1;
-   fib(N) when N > 1 -> fib(N-1) + fib(N-2).
-
-   fib_test_() ->
-       [?_assert(fib(0) =:= 1),
-	?_assert(fib(1) =:= 1),
-	?_assert(fib(2) =:= 2),
-	?_assert(fib(3) =:= 3),
-	?_assert(fib(4) =:= 5),
-	?_assert(fib(5) =:= 8),
-	?_assertException(error, function_clause, fib(-1)),
-	?_assert(fib(31) =:= 2178309)
-       ].
- -

(Author's note: When I first wrote this example, I happened to write a -* instead of + in the fib function. Of course, this showed up -immediately when I ran the tests.)

- -

See EUnit test representation for a full list of all the ways -you can specify test sets in EUnit.

- -

Disabling testing

- -Testing can be turned off by defining the NOTEST macro when compiling, -for example as an option to erlc, as in: -
   erlc -DNOTEST my_module.erl
-or by adding a macro definition to the code, before the EUnit header -file is included: -
   -define(NOTEST, 1).

-(the value is not important, but should typically be 1 or true). -Note that unless the EUNIT_NOAUTO macro is defined, disabling testing -will also automatically strip all test functions from the code, except -for any that are explicitly declared as exported.

- -For instance, to use EUnit in your application, but with testing turned -off by default, put the following lines in a header file: -
   -define(NOTEST, true).
-   -include_lib("eunit/include/eunit.hrl").
-and then make sure that every module of your application includes that -header file. This means that you have a only a single place to modify in -order to change the default setting for testing. To override the NOTEST -setting without modifying the code, you can define TEST in a compiler -option, like this: -
   erlc -DTEST my_module.erl
- -

See Compilation control macros for details about these -macros.

- -

Avoiding compile-time dependency on EUnit

- -If you are distributing the source code for your application for other -people to compile and run, you probably want to ensure that the code -compiles even if EUnit is not available. Like the example in the -previous section, you can put the following lines in a common header -file: -
   -ifdef(TEST).
-   -include_lib("eunit/include/eunit.hrl").
-   -endif.

-and, of course, also make sure that you place all test code that uses -EUnit macros within -ifdef(TEST) or -ifdef(EUNIT) sections.

- - -

EUnit macros

- -

Although all the functionality of EUnit is avaliable even without the -use of preprocessor macros, the EUnit header file defines a number of -such macros in order to make it as easy as possible to write unit tests -as compactly as possible and without getting too many details in the -way.

- -

Except where explicitly stated, using EUnit macros will never introduce -run-time dependencies on the EUnit library code, regardless of whether -your code is compiled with testing enabled or disabled.

- - - -

Basic macros

- -
-
_test(Expr)
-
Turns Expr into a "test object", by wrapping it in a -fun-expression and a source line number. Technically, this is the same -as {?LINE, fun () -> (Expr) end}. -
-
- -

Compilation control macros

- -
-
EUNIT
-
This macro is always defined to true whenever EUnit is enabled at -compile time. This is typically used to place testing code within -conditional compilation, as in: -
   -ifdef(EUNIT).
-       % test code here
-       ...
-   -endif.
-e.g., to ensure that the code can be compiled without including the -EUnit header file, when testing is disabled. See also the macros TEST -and NOTEST. -
- -
EUNIT_NOAUTO
-
If this macro is defined, the automatic exporting or stripping of -test functions will be disabled. -
- -
TEST
-

This macro is always defined (to true, unless previously defined -by the user to have another value) whenever EUnit is enabled at compile -time. This can be used to place testing code within conditional -compilation; see also the macros NOTEST and EUNIT.

- -

For testing code that is strictly dependent on EUnit, it may be -preferable to use the EUNIT macro for this purpose, while for code -that uses more generic testing conventions, using the TEST macro may -be preferred.

- -The TEST macro can also be used to override the NOTEST macro. If -TEST is defined before the EUnit header file is -included (even if NOTEST is also defined), then the code will be -compiled with EUnit enabled. -
- -
NOTEST
-

This macro is always defined (to true, unless previously defined -by the user to have another value) whenever EUnit is disabled -at compile time. (Compare the TEST macro.)

- -This macro can also be used for conditional compilation, but is more -typically used to disable testing: If NOTEST is defined -before the EUnit header file is included, and TEST -is not defined, then the code will be compiled with EUnit -disabled. See also Disabling testing. -
- -
NOASSERT
-
If this macro is defined, the assert macros will have no effect, -when testing is also disabled. See Assert macros. When -testing is enabled, the assert macros are always enabled automatically -and cannot be disabled. -
- -
ASSERT
-
If this macro is defined, it overrides the NOASSERT macro, forcing -the assert macros to always be enabled regardless of other settings. -
- -
NODEBUG
-
If this macro is defined, the debugging macros will have no effect. -See Debugging macros. NODEBUG also implies NOASSERT, -unless testing is enabled. -
- -
DEBUG
-
If this macro is defined, it overrides the NODEBUG macro, forcing -the debugging macros to be enabled. -
-
- -

Utility macros

- -

The following macros can make tests more compact and readable:

- -
-
LET(Var,Arg,Expr)
-
Creates a local binding Var = Arg in Expr. (This is the same as -(fun(Var)->(Expr)end)(Arg).) Note that the binding is not exported -outside of Expr, and that within Expr, this binding of Var will -shadow any binding of Var in the surrounding scope. -
-
IF(Cond,TrueCase,FalseCase)
-
Evaluates TrueCase if Cond evaluates to true, or otherwise -evaluates FalseCase if Cond evaluates to false. (This is the same -as (case (Cond) of true->(TrueCase); false->(FalseCase) end).) Note -that it is an error if Cond does not yield a boolean value. -
-
- -

Assert macros

- -

(Note that these macros also have corresponding forms which start with -an "_" (underscore) character, as in ?_assert(BoolExpr), that create -a "test object" instead of performing the test immediately. This is -equivalent to writing ?_test(assert(BoolExpr)), etc.)

- -

If the macro NOASSERT is defined before the EUnit header file is -included, these macros have no effect when testing is also disabled; see -Compilation control macros for details.

- -
-
assert(BoolExpr)
-

Evaluates the expression BoolExpr, if testing is enabled. Unless -the result is true, an informative exception will be generated. If -there is no exception, the result of the macro expression is the atom -ok, and the value of BoolExpr is discarded. If testing is disabled, -the macro will not generate any code except the atom ok, and -BoolExpr will not be evaluated.

- -Typical usage: -
   ?assert(f(X, Y) =:= [])
- -The assert macro can be used anywhere in a program, not just in unit -tests, to check pre/postconditions and invariants. For example: -
   some_recursive_function(X, Y, Z) ->
-       ?assert(X + Y > Z),
-       ...
-
-
assertNot(BoolExpr)
-
Equivalent to assert(not (BoolExpr)). -
-
assertMatch(GuardedPattern, Expr)
-

Evaluates Expr and matches the result against GuardedPattern, if -testing is enabled. If the match fails, an informative exception will be -generated; see the assert macro for further details. GuardedPattern -can be anything that you can write on the left hand side of the -> -symbol in a case-clause, except that it cannot contain comma-separated -guard tests.

- -

The main reason for using assertMatch also for simple matches, instead -of matching with =, is that it produces more detailed error messages.

- -Examples: -
   ?assertMatch({found, {fred, _}}, lookup(bloggs, Table))
-
   ?assertMatch([X|_] when X > 0, binary_to_list(B))
-
-
assertEqual(Expect, Expr)
-

Evaluates the expressions Expect and Expr and compares the -results for equality, if testing is enabled. If the values are not -equal, an informative exception will be generated; see the assert -macro for further details.

- -

assertEqual is more suitable than than assertMatch when the -left-hand side is a computed value rather than a simple pattern, and -gives more details than ?assert(Expect =:= Expr).

- -Examples: -
   ?assertEqual("b" ++ "a", lists:reverse("ab"))
-
   ?assertEqual(foo(X), bar(Y))
-
-
assertException(ClassPattern, TermPattern, Expr)
-
assertError(TermPattern, Expr)
-
assertExit(TermPattern, Expr)
-
assertThrow(TermPattern, Expr)
-

Evaluates Expr, catching any exception and testing that it matches -the expected ClassPattern:TermPattern. If the match fails, or if no -exception is thrown by Expr, an informative exception will be -generated; see the assert macro for further details. The -assertError, assertExit, and assertThrow macros, are equivalent to -using assertException with a ClassPattern of error, exit, or -throw, respectively.

- -Examples: -
   ?assertError(badarith, X/0)
-
   ?assertExit(normal, exit(normal))
-
   ?assertException(throw, {not_found,_}, throw({not_found,42}))
-
-
- -

Macros for running external commands

- -

Keep in mind that external commands are highly dependent on the -operating system. You can use the standard library function os:type() -in test generator functions, to produce different sets of tests -depending on the current operating system.

- -

Note: these macros introduce a run-time dependency on the EUnit library -code, if compiled with testing enabled.

- -
-
assertCmd(CommandString)
-

Runs CommandString as an external command, if testing is enabled. -Unless the returned status value is 0, an informative exception will be -generated. If there is no exception, the result of the macro expression -is the atom ok. If testing is disabled, the macro will not generate -any code except the atom ok, and the command will not be executed.

- -Typical usage: -
   ?assertCmd("mkdir foo")
-
-
assertCmdStatus(N, CommandString)
-
Like the assertCmd(CommandString) macro, but generates an -exception unless the returned status value is N. -
-
assertCmdOutput(Text, CommandString)
-
Runs CommandString as an external command, if testing is enabled. -Unless the output produced by the command exactly matches the specified -string Text, an informative exception will be generated. (Note that -the output is normalized to use a single LF character as line break on -all platforms.) If there is no exception, the result of the macro -expression is the atom ok. If testing is disabled, the macro will not -generate any code except the atom ok, and the command will not be -executed. -
-
cmd(CommandString)
-

Runs CommandString as an external command. Unless the returned -status value is 0 (indicating success), an informative exception will be -generated; otherwise, the result of the macro expression is the output -produced by the command, as a flat string. The output is normalized to -use a single LF character as line break on all platforms.

- -

This macro is useful in the setup and cleanup sections of fixtures, -e.g., for creating and deleting files or perform similar operating -system specific tasks, to make sure that the test system is informed of -any failures.

- -A Unix-specific example: -
   {setup,
-    fun () -> ?cmd("mktemp") end,
-    fun (FileName) -> ?cmd("rm " ++ FileName) end,
-    ...}
-
-
- -

Debugging macros

- -

To help with debugging, EUnit defines several useful macros for printing -messages directly to the console (rather than to the standard output). -Furthermore, these macros all use the same basic format, which includes -the file and line number where they occur, making it possible in some -development environments (e.g., when running Erlang in an Emacs buffer) -to simply click on the message and jump directly to the corresponding -line in the code.

- -

If the macro NODEBUG is defined before the EUnit header file is -included, these macros have no effect; see -Compilation control macros for details.

- -
-
debugHere
-
Just prints a marker showing the current file and line number. Note -that this is an argument-less macro. The result is always ok.
-
debugMsg(Text)
-
Outputs the message Text (which can be a plain string, an IO-list, -or just an atom). The result is always ok.
-
debugFmt(FmtString, Args)
-
This formats the text like io:format(FmtString, Args) and outputs -it like debugMsg. The result is always ok.
-
debugVal(Expr)
-
Prints both the source code for Expr and its current value. E.g., -?debugVal(f(X)) might be displayed as "f(X) = 42". (Large terms are -shown truncated.) The result is always the value of Expr, so this -macro can be wrapped around any expression to display its value when -the code is compiled with debugging enabled.
-
debugTime(Text,Expr)
-
Prints Text and the wall clock time for evaluation of Expr. The -result is always the value of Expr, so this macro can be wrapped -around any expression to show its run time when the code is compiled -with debugging enabled. For example, List1 = ?debugTime("sorting", -lists:sort(List)) might show as "sorting: 0.015 s".
- -
- - -

EUnit test representation

- -

The way EUnit represents tests and test sets as data is flexible, -powerful, and concise. This section describes the representation in -detail.

- - - -

Simple test objects

- -A simple test object is one of the following: -
    -
  • A nullary functional value (i.e., a fun that takes zero - arguments). Examples: -
       fun () -> ... end
    -
       fun some_function/0
    -
       fun some_module:some_function/0
    -
    • -
  • A pair of atoms {ModuleName, FunctionName}, referring to the - function ModuleName:FunctionName/0
    • -
  • A pair {LineNumber, SimpleTest}, where LineNumber is a - nonnegative integer and SimpleTest is another simple test - object. LineNumber should indicate the source line of the test. - Pairs like this are usually only created via ?_test(...) macros; - see Basic macros.
    • -

-In brief, a simple test object consists of a single function that takes -no arguments (possibly annotated with some additional metadata, i.e., a -line number). Evaluation of the function either succeeds, by -returning some value (which is ignored), or fails, by throwing -an exception.

- -

Test sets and deep lists

- -

A test set can be easily created by placing a sequence of test objects -in a list. If T_1, ..., T_N are individual test objects, then [T_1, -..., T_N] is a test set consisting of those objects (in that order).

- -

Test sets can be joined in the same way: if S_1, ..., S_K are test -sets, then [S_1, ..., S_K] is also a test set, where the tests of -S_i are ordered before those of S_(i+1), for each subset S_i.

- -

Thus, the main representation of test sets is deep lists, and -a simple test object can be viewed as a test set containing only a -single test; there is no difference between T and [T].

- -

A module can also be used to represent a test set; see ModuleName -under Primitives below.

- -

Titles

- -

Any test or test set T can be annotated with a title, by wrapping it -in a pair {Title, T}, where Title is a string. For convenience, any -test which is normally represented using a tuple can simply be given a -title string as the first element, i.e., writing {"The Title", ...} -instead of adding an extra tuple wrapper as in {"The Title", {...}}.

- - -

Primitives

- -The following are primitives, which do not contain other test sets as -arguments: -
-
ModuleName::atom() -
-
A single atom represents a module name, and is equivalent to -{module, ModuleName}. This is often used as in the call -eunit:test(some_module). -
-
{module, ModuleName::atom()} -
-

This composes a test set from the exported test functions of the -named module, i.e., those functions with arity zero whose names end -with _test or _test_. Basically, the ..._test() functions become -simple tests, while the ..._test_() functions become generators.

- -In addition, EUnit will also look for another module whose name is -ModuleName plus the suffix _tests, and if it exists, all the tests -from that module will also be added. (If ModuleName already contains -the suffix _tests, this is not done.) E.g., the specification -{module, mymodule} will run all tests in the modules mymodule and -mymodule_tests. Typically, the _tests module should only contain -test cases that use the public interface of the main module (and no -other code). -
-
{application, AppName::atom(), Info::list()} -
-
This is a normal Erlang/OTP application descriptor, as found in an - .app file. The resulting test set consists of the modules listed in - the modules entry in Info. -
-
{application, AppName::atom()} -
-
This creates a test set from all the modules belonging to the -specified application, by consulting the application's .app file -(see {file, FileName}), or if no such file exists, by testing all -object files in the application's ebin-directory (see {dir, -Path}); if that does not exist, the code:lib_dir(AppName) directory -is used. -
-
Path::string() -
-
A single string represents the path of a file or directory, and is -equivalent to {file, Path}, or {dir, Path}, respectively, depending -on what Path refers to in the file system. -
-
{file, FileName::string()} -
-

If FileName has a suffix that indicates an object file (.beam), -EUnit will try to reload the module from the specified file and test it. -Otherwise, the file is assumed to be a text file containing test -specifications, which will be read using the standard library function -file:path_consult/2.

- -Unless the file name is absolute, the file is first searched for -relative to the current directory, and then using the normal search path -(code:get_path()). This means that the names of typical "app" files -can be used directly, without a path, e.g., "mnesia.app". -
-
{dir, Path::string()} -
-
This tests all object files in the specified directory, as if they -had been individually specified using {file, FileName}. -
-
{generator, GenFun::(() -> Tests)} -
-
The generator function GenFun is called to produce a test -set. -
-
{generator, ModuleName::atom(), FunctionName::atom()} -
-
The function ModuleName:FunctionName() is called to produce a test -set. -
-
{with, X::any(), [AbstractTestFun::((any()) -> any())]} -
-
Distributes the value X over the unary functions in the list, -turning them into nullary test functions. An AbstractTestFun is like -an ordinary test fun, but takes one argument instead of zero - it's -basically missing some information before it can be a proper test. In -practice, {with, X, [F_1, ..., F_N]} is equivalent to [fun () -> -F_1(X) end, ..., fun () -> F_N(X) end]. This is particularly useful if -your abstract test functions are already implemented as proper -functions: {with, FD, [fun filetest_a/1, fun filetest_b/1, fun -filetest_c/1]} is equivalent to [fun () -> filetest_a(FD) end, fun () --> filetest_b(FD) end, fun () -> filetest_c(FD) end], but much more -compact. See also Fixtures, below. -
-
- -

Control

- -The following representations control how and where tests are executed: -
-
{spawn, Tests}
-
Runs the specified tests in a separate subprocess, while the current -test process waits for it to finish. This is useful for tests that need -a fresh, isolated process state. (Note that EUnit always starts at least -one such a subprocess automatically; tests are never executed by the -caller's own process.)
-
{spawn, Node::atom(), Tests}
-
Like {spawn, Tests}, but runs the specified tests on the given -Erlang node.
-
{timeout, Time::number(), Tests}
-
Runs the specified tests under the given timeout. Time is in -seconds; e.g., 60 means one minute and 0.1 means 1/10th of a second. If -the timeout is exceeded, the unfinished tests will be forced to -terminate. Note that if a timeout is set around a fixture, it includes -the time for setup and cleanup, and if the timeout is triggered, the -entire fixture is abruptly terminated (without running the -cleanup).
-
{inorder, Tests}
-
Runs the specified tests in strict order. Also see {inparallel, -Tests}. By default, tests are neither marked as inorder or -inparallel, but may be executed as the test framework chooses.
-
{inparallel, Tests}
-
Runs the specified tests in parallel (if possible). Also see -{inorder, Tests}.
-
{inparallel, N::integer(), Tests}
-
Like {inparallel, Tests}, but running no more than N subtests -simultaneously.
-
- -

Fixtures

- -

A "fixture" is some state that is necessary for a particular set of -tests to run. EUnit's support for fixtures makes it easy to set up such -state locally for a test set, and automatically tear it down again when -the test set is finished, regardless of the outcome (success, failures, -timeouts, etc.).

- -

To make the descriptions simpler, we first list some definitions: -

- - - - - - - - - - - - - - - - - - - -
Setup() -> (R::any())
SetupX(X::any()) -> (R::any())
Cleanup(R::any()) -> any()
CleanupX(X::any(), R::any()) -> any()
Instantiator((R::any()) -> Tests) | {with, [AbstractTestFun::((any()) -> any())]}
Wherelocal | spawn | {spawn, Node::atom()}
-
-(these are explained in more detail further below.)

- -The following representations specify fixture handling for test sets: -
-
{setup, Setup, Tests | Instantiator}
-
{setup, Setup, Cleanup, Tests | Instantiator}
-
{setup, Where, Setup, Tests | Instantiator}
-
{setup, Where, Setup, Cleanup, Tests | Instantiator}
-
setup sets up a single fixture for running all of the specified -tests, with optional teardown afterwards. The arguments are described in -detail below. -
-
{node, Node::atom(), Tests | Instantiator}
-
{node, Node::atom(), Args::string(), Tests | Instantiator}
-
node is like setup, but with a built-in behaviour: it starts a -slave node for the duration of the tests. The atom Node should have -the format nodename@full.machine.name, and Args are the optional -arguments to the new node; see slave:start_link/3 for details. -
-
{foreach, Where, Setup, Cleanup, [Tests | Instantiator]}
-
{foreach, Setup, Cleanup, [Tests | Instantiator]}
-
{foreach, Where, Setup, [Tests | Instantiator]}
-
{foreach, Setup, [Tests | Instantiator]}
-
foreach is used to set up a fixture and optionally tear it down -afterwards, repeated for each single one of the specified test sets. -
-
{foreachx, Where, SetupX, CleanupX, - Pairs::[{X::any(), ((X::any(), R::any()) -> Tests)}]}
-
{foreachx, SetupX, CleanupX, Pairs}
-
{foreachx, Where, SetupX, Pairs}
-
{foreachx, SetupX, Pairs}
-
foreachx is like foreach, but uses a list of pairs, each -containing an extra argument X and an extended instantiator function. -
-
- -

A Setup function is executed just before any of the specified tests -are run, and a Cleanup function is executed when no more of the -specified tests will be run, regardless of the reason. A Setup -function takes no argument, and returns some value which will be passed -as it is to the Cleanup function. A Cleanup function should do -whatever necessary and return some arbitrary value, such as the atom -ok. (SetupX and CleanupX functions are similar, but receive one -additional argument: some value X, which depends on the context.) When -no Cleanup function is specified, a dummy function is used which has -no effect.

- -

An Instantiator function receives the same value as the Cleanup -function, i.e., the value returned by the Setup function. It should -then behave much like a generator (see Primitives), and -return a test set whose tests have been instantiated with the -given value. A special case is the syntax {with, [AbstractTestFun]} -which represents an instantiator function that distributes the value -over a list of unary functions; see Primitives: {with, X, -[...]} for more details.

- -A Where term controls how the specified tests are executed. The -default is spawn, which means that the current process handles the -setup and teardown, while the tests are executed in a subprocess. -{spawn, Node} is like spawn, but runs the subprocess on the -specified node. local means that the current process will handle both -setup/teardown and running the tests - the drawback is that if a test -times out so that the process is killed, the cleanup will not be -performed; hence, avoid this for persistent fixtures such as file -operations. In general, 'local' should only be used when: -
    -
  • the setup/teardown needs to be executed by the process that will - run the tests;
    • -
  • no further teardown needs to be done if the process is killed - (i.e., no state outside the process was affected by the setup)
    • -
- -

Lazy generators

- -

Sometimes, it can be convenient not to produce the whole set of test -descriptions before the testing begins; for example, if you want to -generate a huge amount of tests that would take up too much space to -keep in memory all at once.

- -

It is fairly easy to write a generator which, each time it is called, -either produces an empty list if it is done, or otherwise produces a -list containing a single test case plus a new generator which will -produce the rest of the tests. This demonstrates the basic pattern:

- -
   lazy_test_() ->
-       lazy_gen(10000).
-
-   lazy_gen(N) ->
-       {generator,
-        fun () ->
-            if N > 0 ->
-                   [?_test(...)
-                    | lazy_gen(N-1)];
-               true ->
-                   []
-            end
-        end}.
- -

When EUnit traverses the test representation in order to run the tests, -the new generator will not be called to produce the next test until the -previous test has been executed.

- -Note that it is easiest to write this kind of recursive generator using -a help function, like the lazy_gen/1 function above. It can also be -written using a recursive fun, if you prefer to not clutter your -function namespace and are comfortable with writing that kind of code. - -
-
Overviewerlang logo
-

Generated by EDoc, Apr 22 2009, 22:37:19.

- - diff --git a/lib/eunit/doc/packages-frame.html b/lib/eunit/doc/packages-frame.html deleted file mode 100644 index 52b45534f5..0000000000 --- a/lib/eunit/doc/packages-frame.html +++ /dev/null @@ -1,11 +0,0 @@ - - - -The eunit application - - - -

Packages

-
- - \ No newline at end of file diff --git a/lib/eunit/doc/stylesheet.css b/lib/eunit/doc/stylesheet.css deleted file mode 100644 index e426a90483..0000000000 --- a/lib/eunit/doc/stylesheet.css +++ /dev/null @@ -1,55 +0,0 @@ -/* standard EDoc style sheet */ -body { - font-family: Verdana, Arial, Helvetica, sans-serif; - margin-left: .25in; - margin-right: .2in; - margin-top: 0.2in; - margin-bottom: 0.2in; - color: #000000; - background-color: #ffffff; -} -h1,h2 { - margin-left: -0.2in; -} -div.navbar { - background-color: #add8e6; - padding: 0.2em; -} -h2.indextitle { - padding: 0.4em; - background-color: #add8e6; -} -h3.function,h3.typedecl { - background-color: #add8e6; - padding-left: 1em; -} -div.spec { - margin-left: 2em; - background-color: #eeeeee; -} -a.module,a.package { - text-decoration:none -} -a.module:hover,a.package:hover { - background-color: #eeeeee; -} -ul.definitions { - list-style-type: none; -} -ul.index { - list-style-type: none; - background-color: #eeeeee; -} - -/* - * Minor style tweaks - */ -ul { - list-style-type: square; -} -table { - border-collapse: collapse; -} -td { - padding: 3 -} -- cgit v1.2.3 From 33b9fe219788bb8658cc160620ad6a6757312ea6 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 19 Jul 2011 11:16:27 +0200 Subject: removed cvs keywords from files --- lib/eunit/Makefile | 2 -- lib/eunit/examples/Makefile | 2 -- lib/eunit/include/eunit.hrl | 2 -- lib/eunit/src/eunit.erl | 2 -- lib/eunit/src/eunit_autoexport.erl | 2 -- lib/eunit/src/eunit_data.erl | 2 -- lib/eunit/src/eunit_internal.hrl | 2 -- lib/eunit/src/eunit_lib.erl | 2 -- lib/eunit/src/eunit_listener.erl | 2 -- lib/eunit/src/eunit_proc.erl | 2 -- lib/eunit/src/eunit_serial.erl | 2 -- lib/eunit/src/eunit_server.erl | 2 -- lib/eunit/src/eunit_striptests.erl | 2 -- lib/eunit/src/eunit_surefire.erl | 2 -- lib/eunit/src/eunit_test.erl | 2 -- lib/eunit/src/eunit_tests.erl | 2 -- lib/eunit/src/eunit_tty.erl | 2 -- 17 files changed, 34 deletions(-) diff --git a/lib/eunit/Makefile b/lib/eunit/Makefile index ee69d5e8e0..cd85dff06a 100644 --- a/lib/eunit/Makefile +++ b/lib/eunit/Makefile @@ -13,8 +13,6 @@ # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings # AB. All Rights Reserved.'' # -# $Id$ -# include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk diff --git a/lib/eunit/examples/Makefile b/lib/eunit/examples/Makefile index d1b5bac224..48ec2ebf2b 100644 --- a/lib/eunit/examples/Makefile +++ b/lib/eunit/examples/Makefile @@ -13,8 +13,6 @@ # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings # AB. All Rights Reserved.'' # -# $Id$ -# include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl index 493ba60a2d..db68d8ae60 100644 --- a/lib/eunit/include/eunit.hrl +++ b/lib/eunit/include/eunit.hrl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit.hrl 337 2009-03-09 08:38:28Z rcarlsson $ -%% %% Copyright (C) 2004-2006 Mickaël Rémond, Richard Carlsson %% Including this file turns on testing and defines TEST, unless NOTEST diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl index 15fc3bdf32..cba0e6790a 100644 --- a/lib/eunit/src/eunit.erl +++ b/lib/eunit/src/eunit.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit.erl 339 2009-04-05 14:10:47Z rcarlsson $ -%% %% @copyright 2004-2009 Mickaël Rémond, Richard Carlsson %% @author Mickaël Rémond %% [http://www.process-one.net/] diff --git a/lib/eunit/src/eunit_autoexport.erl b/lib/eunit/src/eunit_autoexport.erl index 7b153c1194..f08096a9f2 100644 --- a/lib/eunit/src/eunit_autoexport.erl +++ b/lib/eunit/src/eunit_autoexport.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_autoexport.erl 329 2009-03-01 11:23:32Z rcarlsson $ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl index 288dd74ddf..d281a1d872 100644 --- a/lib/eunit/src/eunit_data.erl +++ b/lib/eunit/src/eunit_data.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_internal.hrl b/lib/eunit/src/eunit_internal.hrl index 8d0ac30bd7..80890102d0 100644 --- a/lib/eunit/src/eunit_internal.hrl +++ b/lib/eunit/src/eunit_internal.hrl @@ -1,8 +1,6 @@ %% ------------------------------------------------------------------- %% File: eunit_internal.hrl %% -%% $Id: eunit_internal.hrl 329 2009-03-01 11:23:32Z rcarlsson $ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @doc diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl index 45d2387e7b..3385602913 100644 --- a/lib/eunit/src/eunit_lib.erl +++ b/lib/eunit/src/eunit_lib.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_lib.erl 339 2009-04-05 14:10:47Z rcarlsson $ -%% %% @copyright 2004-2007 Mickaël Rémond, Richard Carlsson %% @author Mickaël Rémond %% [http://www.process-one.net/] diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl index 20faecbf01..2783fc85af 100644 --- a/lib/eunit/src/eunit_listener.erl +++ b/lib/eunit/src/eunit_listener.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @author Richard Carlsson %% @copyright 2009 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl index e2d51d8bd5..5440046d11 100644 --- a/lib/eunit/src/eunit_proc.erl +++ b/lib/eunit/src/eunit_proc.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl index d9ccae86f9..83193ca57a 100644 --- a/lib/eunit/src/eunit_serial.erl +++ b/lib/eunit/src/eunit_serial.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_server.erl b/lib/eunit/src/eunit_server.erl index 2cdfef2668..9135fcd691 100644 --- a/lib/eunit/src/eunit_server.erl +++ b/lib/eunit/src/eunit_server.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_server.erl 267 2008-10-19 18:48:03Z rcarlsson $ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_striptests.erl b/lib/eunit/src/eunit_striptests.erl index 606e44b286..ed2c60f219 100644 --- a/lib/eunit/src/eunit_striptests.erl +++ b/lib/eunit/src/eunit_striptests.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_striptests.erl 329 2009-03-01 11:23:32Z rcarlsson $ -%% %% @author Richard Carlsson %% @author Eric Merritt %% @copyright 2006 Richard Carlsson, Eric Merritt diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl index 6e0a447105..af7cc2f17f 100644 --- a/lib/eunit/src/eunit_surefire.erl +++ b/lib/eunit/src/eunit_surefire.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: $ -%% %% @author Mickaël Rémond %% @copyright 2009 Mickaël Rémond, Paul Guyot %% @see eunit diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl index 9ac1d1e7d9..bde5c462b3 100644 --- a/lib/eunit/src/eunit_test.erl +++ b/lib/eunit/src/eunit_test.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_test.erl 336 2009-03-06 14:43:21Z rcarlsson $ -%% %% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl index a63d102d98..9bd9726a78 100644 --- a/lib/eunit/src/eunit_tests.erl +++ b/lib/eunit/src/eunit_tests.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_tests.erl 238 2007-11-15 10:23:54Z mremond $ -%% %% @author Richard Carlsson %% @copyright 2007 Richard Carlsson %% @private diff --git a/lib/eunit/src/eunit_tty.erl b/lib/eunit/src/eunit_tty.erl index 5fe0140559..08c39004c2 100644 --- a/lib/eunit/src/eunit_tty.erl +++ b/lib/eunit/src/eunit_tty.erl @@ -13,8 +13,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id: eunit_tty.erl 330 2009-03-01 16:28:02Z rcarlsson $ -%% %% @author Richard Carlsson %% @copyright 2006-2009 Richard Carlsson %% @private -- cgit v1.2.3 From fde5038d0304b0e6020eae134dbc6bc3b452c867 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 19 Jul 2011 11:45:28 +0200 Subject: updated author e-mails and homepages --- lib/eunit/doc/overview.edoc | 3 +-- lib/eunit/src/eunit.erl | 3 +-- lib/eunit/src/eunit_autoexport.erl | 2 +- lib/eunit/src/eunit_data.erl | 2 +- lib/eunit/src/eunit_internal.hrl | 4 +--- lib/eunit/src/eunit_lib.erl | 3 +-- lib/eunit/src/eunit_listener.erl | 2 +- lib/eunit/src/eunit_proc.erl | 2 +- lib/eunit/src/eunit_serial.erl | 2 +- lib/eunit/src/eunit_server.erl | 2 +- lib/eunit/src/eunit_striptests.erl | 4 ++-- lib/eunit/src/eunit_surefire.erl | 2 +- lib/eunit/src/eunit_test.erl | 2 +- lib/eunit/src/eunit_tests.erl | 2 +- lib/eunit/src/eunit_tty.erl | 2 +- 15 files changed, 16 insertions(+), 21 deletions(-) diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc index 2583f0be25..ad449cb6fc 100644 --- a/lib/eunit/doc/overview.edoc +++ b/lib/eunit/doc/overview.edoc @@ -5,8 +5,7 @@ @title EUnit - a Lightweight Unit Testing Framework for Erlang -@author Richard Carlsson - [http://user.it.uu.se/~richardc/] +@author Richard Carlsson @author Mickaël Rémond [http://www.process-one.net/] @copyright 2004-2007 Mickaël Rémond, Richard Carlsson diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl index cba0e6790a..95857e83c8 100644 --- a/lib/eunit/src/eunit.erl +++ b/lib/eunit/src/eunit.erl @@ -16,8 +16,7 @@ %% @copyright 2004-2009 Mickaël Rémond, Richard Carlsson %% @author Mickaël Rémond %% [http://www.process-one.net/] -%% @author Richard Carlsson -%% [http://user.it.uu.se/~richardc/] +%% @author Richard Carlsson %% @version {@version}, {@date} {@time} %% @doc This module is the main EUnit user interface. diff --git a/lib/eunit/src/eunit_autoexport.erl b/lib/eunit/src/eunit_autoexport.erl index f08096a9f2..099bcb222e 100644 --- a/lib/eunit/src/eunit_autoexport.erl +++ b/lib/eunit/src/eunit_autoexport.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl index d281a1d872..392d378a0e 100644 --- a/lib/eunit/src/eunit_data.erl +++ b/lib/eunit/src/eunit_data.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_internal.hrl b/lib/eunit/src/eunit_internal.hrl index 80890102d0..92694ec39b 100644 --- a/lib/eunit/src/eunit_internal.hrl +++ b/lib/eunit/src/eunit_internal.hrl @@ -1,9 +1,7 @@ %% ------------------------------------------------------------------- %% File: eunit_internal.hrl %% -%% @author Richard Carlsson -%% @copyright 2006 Richard Carlsson -%% @doc +%% Copyright (C) 2006 Richard Carlsson -define(SERVER, eunit_server). -define(DEFAULT_TEST_SUFFIX, "_test"). diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl index 3385602913..1c41e229c5 100644 --- a/lib/eunit/src/eunit_lib.erl +++ b/lib/eunit/src/eunit_lib.erl @@ -16,8 +16,7 @@ %% @copyright 2004-2007 Mickaël Rémond, Richard Carlsson %% @author Mickaël Rémond %% [http://www.process-one.net/] -%% @author Richard Carlsson -%% [http://user.it.uu.se/~richardc/] +%% @author Richard Carlsson %% @private %% @see eunit %% @doc Utility functions for eunit diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl index 2783fc85af..ecaac424a2 100644 --- a/lib/eunit/src/eunit_listener.erl +++ b/lib/eunit/src/eunit_listener.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2009 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl index 5440046d11..ec7d93fd48 100644 --- a/lib/eunit/src/eunit_proc.erl +++ b/lib/eunit/src/eunit_proc.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl index 83193ca57a..80e79116e3 100644 --- a/lib/eunit/src/eunit_serial.erl +++ b/lib/eunit/src/eunit_serial.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_server.erl b/lib/eunit/src/eunit_server.erl index 9135fcd691..2002930abb 100644 --- a/lib/eunit/src/eunit_server.erl +++ b/lib/eunit/src/eunit_server.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_striptests.erl b/lib/eunit/src/eunit_striptests.erl index ed2c60f219..c6ade389ba 100644 --- a/lib/eunit/src/eunit_striptests.erl +++ b/lib/eunit/src/eunit_striptests.erl @@ -13,8 +13,8 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson -%% @author Eric Merritt +%% @author Richard Carlsson +%% @author Eric Merritt %% @copyright 2006 Richard Carlsson, Eric Merritt %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl index af7cc2f17f..607f0871d9 100644 --- a/lib/eunit/src/eunit_surefire.erl +++ b/lib/eunit/src/eunit_surefire.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Mickaël Rémond +%% @author Mickaël Rémond %% @copyright 2009 Mickaël Rémond, Paul Guyot %% @see eunit %% @doc Surefire reports for EUnit (Format used by Maven and Atlassian diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl index bde5c462b3..bca49ae626 100644 --- a/lib/eunit/src/eunit_test.erl +++ b/lib/eunit/src/eunit_test.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl index 9bd9726a78..47ea0aaf46 100644 --- a/lib/eunit/src/eunit_tests.erl +++ b/lib/eunit/src/eunit_tests.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2007 Richard Carlsson %% @private %% @see eunit diff --git a/lib/eunit/src/eunit_tty.erl b/lib/eunit/src/eunit_tty.erl index 08c39004c2..e3e7b710b2 100644 --- a/lib/eunit/src/eunit_tty.erl +++ b/lib/eunit/src/eunit_tty.erl @@ -13,7 +13,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2006-2009 Richard Carlsson %% @private %% @see eunit -- cgit v1.2.3 From c78dae078936252a605630170b81dcd3e09382fa Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Fri, 23 Sep 2011 22:13:23 +0200 Subject: removed some never-matching clauses reported by dialyzer --- lib/eunit/src/eunit_surefire.erl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl index 607f0871d9..2a6cbca14d 100644 --- a/lib/eunit/src/eunit_surefire.erl +++ b/lib/eunit/src/eunit_surefire.erl @@ -56,7 +56,7 @@ { name :: chars(), description :: chars(), - result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, tuple()}, + result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, term()}, time :: integer(), output :: binary() }). @@ -309,7 +309,6 @@ write_testcase( output = Output}, FileDescriptor) -> DescriptionAttr = case Description of - <<>> -> []; [] -> []; _ -> [<<" description=\"">>, escape_attr(Description), <<"\"">>] end, @@ -318,7 +317,6 @@ write_testcase( <<"\" name=\"">>, escape_attr(Name), <<"\"">>, DescriptionAttr], ContentAndEndTag = case {Result, Output} of - {ok, []} -> [<<"/>">>, ?NEWLINE]; {ok, <<>>} -> [<<"/>">>, ?NEWLINE]; _ -> [<<">">>, ?NEWLINE, format_testcase_result(Result), format_testcase_output(Output), ?INDENT, <<"">>, ?NEWLINE] end, @@ -367,7 +365,6 @@ format_testcase_result({skipped, Term}) -> %% Empty output is simply the empty string. %% Other output is inside a xml tag. %% ---------------------------------------------------------------------------- -format_testcase_output([]) -> []; format_testcase_output(Output) -> [?INDENT, ?INDENT, <<"">>, escape_text(Output), ?NEWLINE, ?INDENT, ?INDENT, <<"">>, ?NEWLINE]. @@ -385,8 +382,6 @@ format_time_s([Digit1, Digit2, Digit3 | Tail]) -> [lists:reverse(Tail), $., Digi %% Escape a suite's name to generate the filename. %% Remark: we might overwrite another testsuite's file. %% ---------------------------------------------------------------------------- -escape_suitename([Head | _T] = List) when is_list(Head) -> - escape_suitename(lists:flatten(List)); escape_suitename(Binary) when is_binary(Binary) -> escape_suitename(binary_to_list(Binary)); escape_suitename("module '" ++ String) -> @@ -394,7 +389,6 @@ escape_suitename("module '" ++ String) -> escape_suitename(String) -> escape_suitename(String, []). -escape_suitename(Binary, Acc) when is_binary(Binary) -> escape_suitename(binary_to_list(Binary), Acc); escape_suitename([], Acc) -> lists:reverse(Acc); escape_suitename([$ | Tail], Acc) -> escape_suitename(Tail, [$_ | Acc]); escape_suitename([$' | Tail], Acc) -> escape_suitename(Tail, Acc); -- cgit v1.2.3 From d11d6acb3cea2cb750b69e23811b31f6248aac80 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 2 Aug 2011 21:55:33 +0200 Subject: recognize some more URI schemas in wiki text, in particular https --- lib/edoc/src/edoc_wiki.erl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl index 2f2d14853c..33e687fe63 100644 --- a/lib/edoc/src/edoc_wiki.erl +++ b/lib/edoc/src/edoc_wiki.erl @@ -249,10 +249,20 @@ expand_triple([], L, _, L0) -> expand_uri("http:/" ++ Cs, L, As) -> expand_uri(Cs, L, "/:ptth", As); +expand_uri("https:/" ++ Cs, L, As) -> + expand_uri(Cs, L, "/:sptth", As); expand_uri("ftp:/" ++ Cs, L, As) -> expand_uri(Cs, L, "/:ptf", As); expand_uri("file:/" ++ Cs, L, As) -> expand_uri(Cs, L, "/:elif", As); +expand_uri("mailto:/" ++ Cs, L, As) -> + expand_uri(Cs, L, "/:otliam", As); +expand_uri("nfs:/" ++ Cs, L, As) -> + expand_uri(Cs, L, "/:sfn", As); +expand_uri("shttp:/" ++ Cs, L, As) -> + expand_uri(Cs, L, "/:ptths", As); +expand_uri("xmpp:/" ++ Cs, L, As) -> + expand_uri(Cs, L, "/:ppmx", As); expand_uri(Cs, L, As) -> expand(Cs, L, [$[ | As]). -- cgit v1.2.3 From 766d0f0b20d672e90f2672c6b4b9a441497f5ea5 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Sat, 6 Aug 2011 16:55:07 +0200 Subject: updated author e-mail --- lib/edoc/doc/overview.edoc | 8 ++++---- lib/edoc/include/edoc_doclet.hrl | 2 +- lib/edoc/src/edoc.erl | 2 +- lib/edoc/src/edoc.hrl | 2 +- lib/edoc/src/edoc_data.erl | 2 +- lib/edoc/src/edoc_doclet.erl | 2 +- lib/edoc/src/edoc_extract.erl | 2 +- lib/edoc/src/edoc_layout.erl | 2 +- lib/edoc/src/edoc_lib.erl | 2 +- lib/edoc/src/edoc_macros.erl | 2 +- lib/edoc/src/edoc_parser.yrl | 4 ++-- lib/edoc/src/edoc_refs.erl | 2 +- lib/edoc/src/edoc_report.erl | 2 +- lib/edoc/src/edoc_run.erl | 2 +- lib/edoc/src/edoc_scanner.erl | 2 +- lib/edoc/src/edoc_tags.erl | 2 +- lib/edoc/src/edoc_types.erl | 2 +- lib/edoc/src/edoc_types.hrl | 2 +- lib/edoc/src/edoc_wiki.erl | 2 +- lib/edoc/src/otpsgml_layout.erl | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/edoc/doc/overview.edoc b/lib/edoc/doc/overview.edoc index fa699c6f08..2af425272e 100644 --- a/lib/edoc/doc/overview.edoc +++ b/lib/edoc/doc/overview.edoc @@ -3,7 +3,7 @@ EDoc overview page -@author Richard Carlsson +@author Richard Carlsson @copyright 2003-2006 Richard Carlsson @version {@version} @title Welcome to EDoc @@ -277,12 +277,12 @@ The following tags can be used before a module declaration: Examples: ```%% @author Richard Carlsson''' -```%% @author Richard Carlsson +```%% @author Richard Carlsson %% [http://user.it.uu.se/~richardc/]''' -```%% @author ''' +```%% @author ''' -```%% @author richardc@it.uu.se [http://user.it.uu.se/~richardc/]''' +```%% @author carlsson.richard@gmail.com [http://user.it.uu.se/~richardc/]'''
`@copyright'
diff --git a/lib/edoc/include/edoc_doclet.hrl b/lib/edoc/include/edoc_doclet.hrl index a99ff1fbab..60ec7f44e4 100644 --- a/lib/edoc/include/edoc_doclet.hrl +++ b/lib/edoc/include/edoc_doclet.hrl @@ -18,7 +18,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% Author contact: richardc@it.uu.se +%% Author contact: carlsson.richard@gmail.com %% ===================================================================== -define(NO_APP, []). diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl index a279f7dcb3..544465b14a 100644 --- a/lib/edoc/src/edoc.erl +++ b/lib/edoc/src/edoc.erl @@ -15,7 +15,7 @@ %% USA %% %% @copyright 2001-2007 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @version {@version} %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc.hrl b/lib/edoc/src/edoc.hrl index 31cf45ade9..98debba4ab 100644 --- a/lib/edoc/src/edoc.hrl +++ b/lib/edoc/src/edoc.hrl @@ -18,7 +18,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% Author contact: richardc@it.uu.se +%% Author contact: carlsson.richard@gmail.com %% ===================================================================== %% Note: Documentation in this file is included by edoc_extract.erl diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl index e3b5a0d51b..aad0b14371 100644 --- a/lib/edoc/src/edoc_data.erl +++ b/lib/edoc/src/edoc_data.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl index c66be9d7c7..385d20e9ae 100644 --- a/lib/edoc/src/edoc_doclet.erl +++ b/lib/edoc/src/edoc_doclet.erl @@ -15,7 +15,7 @@ %% USA %% %% @copyright 2003-2006 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_extract.erl b/lib/edoc/src/edoc_extract.erl index 1209d86fe5..bdda09db1c 100644 --- a/lib/edoc/src/edoc_extract.erl +++ b/lib/edoc/src/edoc_extract.erl @@ -15,7 +15,7 @@ %% USA %% %% @copyright 2001-2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl index 1c0841815f..951cec121c 100644 --- a/lib/edoc/src/edoc_layout.erl +++ b/lib/edoc/src/edoc_layout.erl @@ -14,7 +14,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @copyright 2001-2006 Richard Carlsson %% @see edoc %% @end diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl index 6c698e83ef..df929ebf04 100644 --- a/lib/edoc/src/edoc_lib.erl +++ b/lib/edoc/src/edoc_lib.erl @@ -15,7 +15,7 @@ %% USA %% %% @copyright 2001-2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl index 5b512cb53a..70fb38bf0a 100644 --- a/lib/edoc/src/edoc_macros.erl +++ b/lib/edoc/src/edoc_macros.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2001-2005 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl index 3ce4cde4fb..2871846c04 100644 --- a/lib/edoc/src/edoc_parser.yrl +++ b/lib/edoc/src/edoc_parser.yrl @@ -22,7 +22,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% Author contact: richardc@it.uu.se +%% Author contact: carlsson.richard@gmail.com %% ===================================================================== Nonterminals @@ -255,7 +255,7 @@ throws -> etype where_defs: %% "%% USA" %% "%%" %% "%% @private" -%% "%% @author Richard Carlsson " +%% "%% @author Richard Carlsson " %% "%% ====================================================================" %% . diff --git a/lib/edoc/src/edoc_refs.erl b/lib/edoc/src/edoc_refs.erl index b974cf77c1..1f578a3b83 100644 --- a/lib/edoc/src/edoc_refs.erl +++ b/lib/edoc/src/edoc_refs.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @see edoc_parse_ref %% @end diff --git a/lib/edoc/src/edoc_report.erl b/lib/edoc/src/edoc_report.erl index f082513bee..9bec08ab97 100644 --- a/lib/edoc/src/edoc_report.erl +++ b/lib/edoc/src/edoc_report.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2001-2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl index 1355db840f..48b6137ac1 100644 --- a/lib/edoc/src/edoc_run.erl +++ b/lib/edoc/src/edoc_run.erl @@ -15,7 +15,7 @@ %% USA %% %% @copyright 2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_scanner.erl b/lib/edoc/src/edoc_scanner.erl index 8e895ad1ad..754fcef643 100644 --- a/lib/edoc/src/edoc_scanner.erl +++ b/lib/edoc/src/edoc_scanner.erl @@ -16,7 +16,7 @@ %% @private %% @copyright Richard Carlsson 2001-2003. Portions created by Ericsson %% are Copyright 1999, Ericsson Utvecklings AB. All Rights Reserved. -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl index 80989428ce..2d986988c2 100644 --- a/lib/edoc/src/edoc_tags.erl +++ b/lib/edoc/src/edoc_tags.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2001-2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl index a54544868c..60c6cecb97 100644 --- a/lib/edoc/src/edoc_types.erl +++ b/lib/edoc/src/edoc_types.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2001-2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/edoc_types.hrl b/lib/edoc/src/edoc_types.hrl index 1353bfb93a..05c61d70ff 100644 --- a/lib/edoc/src/edoc_types.hrl +++ b/lib/edoc/src/edoc_types.hrl @@ -18,7 +18,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% Author contact: richardc@it.uu.se +%% Author contact: carlsson.richard@gmail.com %% ===================================================================== %% Type specification data structures diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl index 33e687fe63..5c71658af5 100644 --- a/lib/edoc/src/edoc_wiki.erl +++ b/lib/edoc/src/edoc_wiki.erl @@ -16,7 +16,7 @@ %% %% @private %% @copyright 2001-2003 Richard Carlsson -%% @author Richard Carlsson +%% @author Richard Carlsson %% @see edoc %% @end %% ===================================================================== diff --git a/lib/edoc/src/otpsgml_layout.erl b/lib/edoc/src/otpsgml_layout.erl index d425dc0ed8..2c4cd919bb 100644 --- a/lib/edoc/src/otpsgml_layout.erl +++ b/lib/edoc/src/otpsgml_layout.erl @@ -14,7 +14,7 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% @author Richard Carlsson +%% @author Richard Carlsson %% @author Kenneth Lundin %% @copyright 2001-2004 Richard Carlsson %% @see edoc_layout -- cgit v1.2.3 From 10f76823b8c71ecc84f51bf9f93514d6d25a4a77 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Thu, 18 Aug 2011 14:32:36 +0200 Subject: URI-escape bytes as two hex digits always (reported by Alfonso De Gregorio) --- lib/edoc/src/edoc_lib.erl | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl index df929ebf04..7fd8358add 100644 --- a/lib/edoc/src/edoc_lib.erl +++ b/lib/edoc/src/edoc_lib.erl @@ -403,8 +403,13 @@ escape_uri([C | Cs]) -> escape_uri([]) -> []. -escape_byte(C) -> - "%" ++ hex_octet(C). +escape_byte(C) when C >= 0, C =< 255 -> + [$%, hex_digit(C bsr 4), hex_digit(C band 15)]. + +hex_digit(N) when N >= 0, N =< 9 -> + N + $0; +hex_digit(N) when N > 9, N =< 15 -> + N + $a - 10. % utf8([C | Cs]) when C > 16#7f -> % [((C band 16#c0) bsr 6) + 16#c0, C band 16#3f ++ 16#80 | utf8(Cs)]; @@ -413,13 +418,6 @@ escape_byte(C) -> % utf8([]) -> % []. -hex_octet(N) when N =< 9 -> - [$0 + N]; -hex_octet(N) when N > 15 -> - hex_octet(N bsr 4) ++ hex_octet(N band 15); -hex_octet(N) -> - [N - 10 + $a]. - %% Please note that URI are *not* file names. Don't use the stdlib %% 'filename' module for operations on (any parts of) URI. -- cgit v1.2.3 From 530d3b1c4b242d31fa035a3d3865ced2576ef1bb Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Wed, 24 Aug 2011 14:38:01 +0200 Subject: Fix macro expansion in comments following Erlang types Macros in comments following Erlang types were not expanded. An example: -type t() :: integer(). %% This type is used in {@link foo/0}. The link to foo/0 was not created. --- lib/edoc/src/edoc_extract.erl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/edoc/src/edoc_extract.erl b/lib/edoc/src/edoc_extract.erl index bdda09db1c..5a79e127f6 100644 --- a/lib/edoc/src/edoc_extract.erl +++ b/lib/edoc/src/edoc_extract.erl @@ -75,7 +75,7 @@ source(Forms, Comments, File, Env, Opts) when is_list(Forms) -> source(Forms1, Comments, File, Env, Opts); source(Forms, Comments, File, Env, Opts) -> Tree = erl_recomment:quick_recomment_forms(Forms, Comments), - TypeDocs = find_type_docs(Forms, Comments), + TypeDocs = find_type_docs(Forms, Comments, Env, File), source1(Tree, File, Env, Opts, TypeDocs). %% @spec source(Forms, File::filename(), Env::edoc_env(), @@ -111,7 +111,7 @@ source(Forms, Comments, File, Env, Opts) -> source(Forms, File, Env, Opts) when is_list(Forms) -> source(erl_syntax:form_list(Forms), File, Env, Opts); source(Tree, File0, Env, Opts) -> - TypeDocs = find_type_docs(Tree, []), + TypeDocs = find_type_docs(Tree, [], Env, File0), source1(Tree, File0, Env, Opts, TypeDocs). %% Forms0 and Comments is used for extracting Erlang type documentation. @@ -635,14 +635,17 @@ file_macros(_Context, Env) -> %% The same thing using -type: %% -type t() :: t1(). % Some docs of t/0; %% Further docs of t/0. -find_type_docs(Forms0, Comments) -> +find_type_docs(Forms0, Comments, Env, File) -> Tree = erl_recomment:recomment_forms(Forms0, Comments), Forms = preprocess_forms(Tree), - edoc_specs:docs(Forms, fun find_fun/2). + Env1 = add_macro_defs(edoc_macros:std_macros(Env), [], Env), + F = fun(C, Line) -> find_fun(C, Line, Env1, File) end, + edoc_specs:docs(Forms, F). -find_fun(C0, Line) -> +find_fun(C0, Line, Env, File) -> C1 = comment_text(C0), Text = lists:append([C#comment.text || C <- C1]), Comm = #comment{line = Line, text = Text}, [Tag | _] = scan_tags([Comm]), - Tag. + [Tag1] = edoc_macros:expand_tags([Tag], Env, File), + Tag1. -- cgit v1.2.3 From 823f01895f33e559d737880d9207054a20dcc2f8 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Fri, 23 Sep 2011 22:19:10 +0200 Subject: removed some never-matching clauses reported by dialyzer --- lib/edoc/src/edoc_parser.yrl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl index 2871846c04..4d6428f75b 100644 --- a/lib/edoc/src/edoc_parser.yrl +++ b/lib/edoc/src/edoc_parser.yrl @@ -455,8 +455,6 @@ parse_throws(S, L) -> -spec throw_error(term(), erl_scan:line()) -> no_return(). -throw_error({L, M, D}, _L0) -> - throw({error,L,{format_error,M,D}}); throw_error({parse_spec, E}, L) -> throw_error({"specification", E}, L); throw_error({parse_typedef, E}, L) -> @@ -468,7 +466,4 @@ throw_error({parse_throws, E}, L) -> throw_error(parse_param, L) -> throw({error, L, "missing parameter name"}); throw_error({Where, E}, L) when is_list(Where) -> - throw({error,L,{"unknown error parsing ~s: ~P.",[Where,E,15]}}); -throw_error(E, L) -> - %% Just in case. - throw({error,L,{"unknown parse error: ~P.",[E,15]}}). + throw({error,L,{"unknown error parsing ~s: ~P.",[Where,E,15]}}). -- cgit v1.2.3 From df2063c1e436cfb2bb9283df074c4eaa87aeec91 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Sun, 25 Sep 2011 20:33:33 +0200 Subject: bumped revision --- lib/edoc/vsn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk index 30cf191ffc..22f225dd9b 100644 --- a/lib/edoc/vsn.mk +++ b/lib/edoc/vsn.mk @@ -1 +1 @@ -EDOC_VSN = 0.7.8 +EDOC_VSN = 0.7.9 -- cgit v1.2.3