Skip to content

Commit

Permalink
Delete trailing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
mathbunnyru committed Jan 12, 2017
1 parent 191addd commit 4070d2a
Show file tree
Hide file tree
Showing 35 changed files with 447 additions and 447 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ MyTestSuite.h:

#include <cxxtest/TestSuite.h>

class MyTestSuite : public CxxTest::TestSuite
class MyTestSuite : public CxxTest::TestSuite
{
public:
void testAddition( void )
Expand Down
18 changes: 9 additions & 9 deletions build_tools/SCons/cxxtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Maintainer: Gašper Ažman <[email protected]>
#
# This file is maintained as a part of the CxxTest test suite.
#
#
# == About ==
#
# This builder correctly tracks dependencies and supports just about every
Expand Down Expand Up @@ -155,14 +155,14 @@ def UnitTest(env, target, source = [], **kwargs):

def isValidScriptPath(cxxtestgen):
"""check keyword arg or environment variable locating cxxtestgen script"""

if cxxtestgen and os.path.exists(cxxtestgen):
return True
else:
SCons.Warnings.warn(ToolCxxTestWarning,
"Invalid CXXTEST environment variable specified!")
return False

def defaultCxxTestGenLocation(env):
return os.path.join(
envget(env, 'CXXTEST_CXXTESTGEN_DEFAULT_LOCATION'),
Expand All @@ -171,7 +171,7 @@ def defaultCxxTestGenLocation(env):

def findCxxTestGen(env):
"""locate the cxxtestgen script by checking environment, path and project"""

# check the SCons environment...
# Then, check the OS environment...
cxxtest = envget(env, 'CXXTEST', None)
Expand Down Expand Up @@ -201,18 +201,18 @@ def findCxxTestGen(env):
# make sure it was correct
if isValidScriptPath(cxxtest):
return os.path.realpath(cxxtest)

# No valid environment variable found, so...
# Next, check the path...
# Next, check the project
check_path = os.path.join(
envget(env, 'CXXTEST_INSTALL_DIR'),
envget(env, 'CXXTEST_CXXTESTGEN_DEFAULT_LOCATION'))

cxxtest = (env.WhereIs(envget(env, 'CXXTEST_CXXTESTGEN_SCRIPT_NAME')) or
cxxtest = (env.WhereIs(envget(env, 'CXXTEST_CXXTESTGEN_SCRIPT_NAME')) or
env.WhereIs(envget(env, 'CXXTEST_CXXTESTGEN_SCRIPT_NAME'),
path=[Dir(check_path).abspath]))

if cxxtest:
return cxxtest
else:
Expand Down Expand Up @@ -286,7 +286,7 @@ def generate(env, **kwargs):
#
# Expected behaviour: keyword arguments override environment variables;
# environment variables override default settings.
#
#
env.SetDefault( CXXTEST_RUNNER = 'ErrorPrinter' )
env.SetDefault( CXXTEST_OPTS = '' )
env.SetDefault( CXXTEST_SUFFIX = '.t.h' )
Expand Down Expand Up @@ -316,7 +316,7 @@ def generate(env, **kwargs):

# find and add the CxxTest headers to the path.
env.AppendUnique( CXXTEST_CPPPATH = findCxxTestHeaders(env) )

cxxtest = env['CXXTEST']
if cxxtest:
#
Expand Down
8 changes: 4 additions & 4 deletions build_tools/SCons/test/eprouvette.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def main():
"""Parse the options and execute the program."""
usage = \
"""Usage: %prog [options] [test1 [test2 [...]]]
If you provide one or more tests, this will run the provided tests.
Otherwise, it will look for tests in the current directory and run them all.
"""
Expand Down Expand Up @@ -58,7 +58,7 @@ def main():
help='turn on debug output.')

(options, args) = parser.parse_args()

if options.debug or options.verbose:
tool_stdout = None
# gather the tests
Expand All @@ -76,7 +76,7 @@ def main():
elif options.action == 'clean':
for t in tests:
clean_test(t)

def crawl_tests(target):
"""Gather the directories in the test directory."""
files = os.listdir(target)
Expand Down Expand Up @@ -204,7 +204,7 @@ def run_scons(t, opts):
os.chdir(cwd) # clean up
raise e
os.chdir(cwd)

if __name__ == "__main__":
main()

Expand Down
4 changes: 2 additions & 2 deletions build_tools/SCons/test/globbing_edmundo/hellotest.t.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#include <cxxtest/TestSuite.h>
#include <hello.hh>


class helloTestSuite : public CxxTest::TestSuite

class helloTestSuite : public CxxTest::TestSuite
{
public:
void testFoo()
Expand Down
4 changes: 2 additions & 2 deletions cxxtest/Mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@ namespace dummy_mock_ns {}
{ \
CXXTEST_MOCK_NAMESPACE::Base_##MOCK::current().NAME CALL; \
} \

//
// Error for calling mock function w/o object
//
#define __CXXTEST_MOCK_UNIMPLEMENTED( NAME, ARGS ) \
TS_FAIL( CXXTEST_MOCK_NAMESPACE_STR #NAME #ARGS " called with no " \
CXXTEST_MOCK_NAMESPACE_STR "Base_" #NAME " object" ); \

#define CXXTEST_MOCK_NAMESPACE_STR __CXXTEST_STR(CXXTEST_MOCK_NAMESPACE) "::"
#define __CXXTEST_STR(X) __CXXTEST_XSTR(X)
#define __CXXTEST_XSTR(X) #X
Expand Down
6 changes: 3 additions & 3 deletions cxxtest/XmlFormatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ class XmlFormatter : public TestListener
std::string retVal;
const time_t now(time(NULL));
char current_date_string[27];

#ifdef WIN32
if (ctime_s(current_date_string, sizeof(current_date_string)-1, &now) == 0)
{
Expand All @@ -607,11 +607,11 @@ class XmlFormatter : public TestListener
}
#else
const size_t n = strlen(ctime_r(&now, current_date_string));
if (n)
if (n)
{
current_date_string[n-1] = '\0'; // remove the ending \n
retVal = current_date_string;
}
}
#endif
return retVal;
}
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ A2X_OPTS := -a toc -a icons -L -d article -v --xsltproc-opts "$(XSLTPROC_OP

all: guide.html guide.pdf guide.epub

manpages:
manpages:
cd man; ./create_manpage;
cd man; asciidoc -v -d manpage ./cxxtestgen.1.txt

Expand Down
42 changes: 21 additions & 21 deletions doc/epub/README
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,50 @@
These are XSL stylesheets for transforming DocBook XML document
instances into .epub format.

.epub is an open standard of the The International Digital Publishing Forum (IDPF),
a the trade and standards association for the digital publishing industry.
.epub is an open standard of the The International Digital Publishing Forum (IDPF),
a the trade and standards association for the digital publishing industry.

An alpha-quality reference implementation (dbtoepub) for a DocBook to .epub
converter (written in Ruby) is available under bin/.
An alpha-quality reference implementation (dbtoepub) for a DocBook to .epub
converter (written in Ruby) is available under bin/.

From http://idpf.org
What is EPUB, .epub, OPS/OCF & OEB?

".epub" is the file extension of an XML format for reflowable digital
books and publications. ".epub" is composed of three open standards,
the Open Publication Structure (OPS), Open Packaging Format (OPF) and
Open Container Format (OCF), produced by the IDPF. "EPUB" allows
publishers to produce and send a single digital publication file
through distribution and offers consumers interoperability between
software/hardware for unencrypted reflowable digital books and other
publications. The Open eBook Publication Structure or "OEB",
originally produced in 1999, is the precursor to OPS.
".epub" is the file extension of an XML format for reflowable digital
books and publications. ".epub" is composed of three open standards,
the Open Publication Structure (OPS), Open Packaging Format (OPF) and
Open Container Format (OCF), produced by the IDPF. "EPUB" allows
publishers to produce and send a single digital publication file
through distribution and offers consumers interoperability between
software/hardware for unencrypted reflowable digital books and other
publications. The Open eBook Publication Structure or "OEB",
originally produced in 1999, is the precursor to OPS.

----------------------------------------------------------------------
.epub Constraints
.epub Constraints
----------------------------------------------------------------------

.epub does not support all of the image formats that DocBook supports.
When an image is available in an accepted format, it will be used. The
accepted @formats are: 'GIF','GIF87a','GIF89a','JPEG','JPG','PNG','SVG'
A mime-type for the image will be guessed from the file extension,
A mime-type for the image will be guessed from the file extension,
which may not work if your file extensions are non-standard.

Non-supported elements:
* <mediaobjectco>
* <inlinegraphic>, <graphic>, <textdata>, <imagedata> with text/XML
* <mediaobjectco>
* <inlinegraphic>, <graphic>, <textdata>, <imagedata> with text/XML
@filerefs
* <olink>
* <cmdsynopsis> in lists (generic XHTML rendering inability)
* <footnote><para><programlisting> (just make your programlistings
* <footnote><para><programlisting> (just make your programlistings
siblings, rather than descendents of paras)

----------------------------------------------------------------------
dbtoepub Reference Implementation
----------------------------------------------------------------------

An alpha-quality DocBook to .epub conversion program, dbtoepub, is provided
in bin/dbtoepub.
in bin/dbtoepub.

This tool requires:
- 'xsltproc' in your PATH
Expand All @@ -65,7 +65,7 @@ $ dbtoepub --help

.epub is defined by the IDPF at www.idpf.org and is made up of 3 standards:
- Open Publication Structure (OPS)
- Open Packaging Format (OPF)
- Open Packaging Format (OPF)
- Open Container Format (OCF)

Specific options:
Expand All @@ -78,7 +78,7 @@ $ dbtoepub --help
Validation
----------------------------------------------------------------------

The epubcheck project provides limited validation for .epub documents.
The epubcheck project provides limited validation for .epub documents.
See http://code.google.com/p/epubcheck/ for details.

----------------------------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions doc/epub/bin/dbtoepub
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env ruby
# This program converts DocBook documents into .epub files.
#
#
# Usage: dbtoepub [OPTIONS] [DocBook Files]
#
# .epub is defined by the IDPF at www.idpf.org and is made up of 3 standards:
# - Open Publication Structure (OPS)
# - Open Packaging Format (OPF)
# - Open Packaging Format (OPF)
# - Open Container Format (OCF)
#
# Specific options:
Expand Down Expand Up @@ -43,7 +43,7 @@ opts.banner = "Usage: #{File.basename($0)} [OPTIONS] [DocBook Files]
.epub is defined by the IDPF at www.idpf.org and is made up of 3 standards:
- Open Publication Structure (OPS)
- Open Packaging Format (OPF)
- Open Packaging Format (OPF)
- Open Container Format (OCF)
Specific options:"
Expand All @@ -68,9 +68,9 @@ db_files.each {|docbook_file|

if output_file
epub_file = output_file
else
else
epub_file = File.basename(docbook_file, ".xml") + ".epub"
end
end
puts "Rendering DocBook file #{docbook_file} to #{epub_file}" if verbose
e.render_to_file(epub_file)
}
}
Loading

0 comments on commit 4070d2a

Please sign in to comment.