Skip to content

Commit a417a92

Browse files
saden1saden1
committed
- renamed junit module to junit4
- added contributing, changelog, releasing docs - updated secrets and before_install script
1 parent 0264fac commit a417a92

File tree

368 files changed

+1017
-861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

368 files changed

+1017
-861
lines changed

‎.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,5 @@ release.properties
88
dependency-reduced-pom.xml
99
buildNumber.properties
1010
.mvn/timing.properties
11-
**/pubring.gpg
12-
**/settings.xml
13-
**/secring.gpg
14-
**/secrets.tar
15-
**/secrets.tar.gz
11+
secrets/
12+
**/secrets.tar.gz

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,3 @@ after_success:
3838
- codecov
3939
- ./after_success.sh
4040

41-
env:
42-
global:
43-
- secure: JQ2CL1Gtuq7s1xfEn8Z3Xax6CBqellU2tOm8KjvN/75amZwsaPWt9YJQHY73SLVpVAmqHwLE0A5bI/pfRhkrIgGW6urUb0JBWJcsmo198Yg/rg/WBmyQGb7gLDZ8YZ6ci+0W5MFpg5zYCP7q7PFxkAl9fRGblZzN7VEn+fV70WHAOhveWXICxHHcULkQTKYjl8UumDP4Nm+wpyF4MT31OW1YI9lroVi0nk/CDqh+j9kXAceJ6qsYaD/x0pV0j8r23PCmnH2tf9PDX5df0UtW9hCxhyQrV+1r/m8NRKo+cVlCYFfzySum0uonq6ZejrHbFhGs1eHOj5/yf46k+J5/lKIPqoRn+tRYRAk9fPah2hhwdquQLriju4MyGLP5Q20qXwICClJZiGfq8eb0EffCUHyY9pfhl3kGdYOxqCFvfWDwZCMJaEfyuCmsDAIIre7A90MhCn3ERyP075yMkTh8rGH+wAii7Tu1ABUXg5thxC12SYWZtWP+arPmMw4w94iBd15iDqRoWTvU/Jwy2TyP0bLreTs0Ia5pgg4HkwEiND1Yzd7ZYABERqRP6ZJk8qTNBVkfybQAZ8vBsA9D4hfIIObmSkFlY/rr5HQmojJUOaDzQRfCRPp3uqPYFpZraaCnFQohSTqDtIuXN7LaUkmEsAjkAL9WtFkBG8H8KjRT0LM=

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Change Log
2+
All notable changes to this project will be documented in this file. This project
3+
adheres to [Semantic Versioning](http://semver.org/). The change log file consists
4+
of sections listing each version and the date they were released along with what
5+
was added, changed, deprecated, removed, fix and security fixes.
6+
7+
- Added - Lists new features
8+
- Changed - Lists changes in existing functionality
9+
- Deprecated - Lists once-stable features that will be removed in upcoming releases
10+
- Removed - Lists deprecated features removed in this release
11+
- Fixed - Lists any bug fixes
12+
- Security - Lists security fixes to security vulnerabilities
13+
14+
## [Unreleased]
15+
16+
### Added
17+
- Example JUnit4 Unit Test
18+
- Example JUnit4 Spring Integration Test
19+
- Example JUnit4 SpringBoot System Test
20+
- Example JUnit4 Spring System Test
21+
- Example JUnit4 HK2 Integration Test
22+
- Example JUnit4 Jersey 2 System Test
23+
- Example JUnit4 Guice Integration Test
24+
- Example JUnit4 Resource Provider

‎CONTRIBUTING.md

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Contributing
2+
3+
## Building from Source
4+
Testify uses a Maven-based build system. To build from source follow the bellow instructions:
5+
6+
### Install Prerequisites
7+
- [Git 1.9.1](https://git-scm.com/downloads) or above
8+
- [JDK 8](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html) (be sure to set `JAVA_HOME`)
9+
- [Maven 3.3.3](https://maven.apache.org/download.cgi) or above
10+
- [Docker 1.11.1](https://docs.docker.com/engine/installation)
11+
- [Install GitFlow](http://danielkummer.github.io/git-flow-cheatsheet)
12+
- Initialize GitFlow:
13+
```bash
14+
$ git flow init
15+
Branch name for production releases: master
16+
Branch name for "next release" development: develop
17+
Feature branch prefix: feature/
18+
Bugfix branch prefix: bugfix/
19+
Release branch prefix: release/
20+
Hotfix branch prefix: hotfix/
21+
Support branch prefix: support/
22+
Version tag prefix:
23+
```
24+
25+
### Check out sources
26+
-- Via SSH (preferred for security reasons):
27+
```
28+
$ git clone git@github.com:testify-project/testify.git
29+
```
30+
- Or via HTTPS:
31+
32+
```
33+
$ git clone https://github.com/testify-project/examples.git
34+
```
35+
36+
### Compile, build, and install Testify JARs into your local Maven Cache
37+
```
38+
$ mvn install -Dmaven.test.skip
39+
```
40+
41+
### Compile, test, build, and install Testify JARs into your local Maven Cache
42+
```
43+
$ mvn install
44+
```
45+
46+
## Adding an Example
47+
- Create a feature:
48+
```bash
49+
$ git flow feature start awesome-example
50+
```
51+
- Do some development:
52+
- Add `awesome-example` module to JUnitX module
53+
- Add `awesome-example-archetype` to the Archetypes module
54+
- Run `update_archetype.sh` to copy archetype generated by `awesome-example` to `awesome-example-archetype`
55+
- Commit to awesome-example branch:
56+
```bash
57+
$ git commit -m "awesome-example description" .
58+
```
59+
- Publish feature:
60+
```bash
61+
$ git flow feature publish awesome-example
62+
```
63+
- Finish the feature:
64+
```bash
65+
$ git flow feature finish awesome-example
66+
```
67+
68+
## Issue Pull Request
69+
[Pull requests](https://github.com/testify-project/examples/pulls) are welcome.

‎README.md

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,45 @@
1-
# examples
2-
Example projects using Testify
1+
# Examples
2+
[![Build Status](https://travis-ci.org/testify-project/examples.svg?branch=develop)](https://travis-ci.org/testify-project/examples)
3+
[![Join the chat on Gitter](https://badges.gitter.im/testify-project/Lobby.svg)](https://gitter.im/testify-project/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4+
[![CodecovIO](https://codecov.io/github/testify-project/examples/coverage.svg?branch=develop)](https://codecov.io/github/testify-project/examples?branch=develop)
5+
[![Latest Release](https://img.shields.io/github/release/testify-project/examples.svg)](https://github.com/testify-project/examples/releases/latest)
6+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.testifyproject/examples/badge.svg?style=flat)](http://repo1.maven.org/maven2/org/testifyproject/examples/)
7+
[![License](https://img.shields.io/badge/license-Apache%20License%202-lightgrey.svg)](https://github.com/testify-project/examples/blob/develop/LICENSE)
8+
9+
## Overview
10+
A repository that contains Testify Project examples and archtypes based on these examples.
11+
12+
## Examples
13+
- Example JUnit4 Unit Test
14+
- Example JUnit4 Spring Integration Test
15+
- Example JUnit4 SpringBoot System Test
16+
- Example JUnit4 Spring System Test
17+
- Example JUnit4 HK2 Integration Test
18+
- Example JUnit4 Jersey 2 System Test
19+
- Example JUnit4 Guice Integration Test
20+
- Example JUnit4 Resource Provider
21+
22+
## Learning
23+
- Testify documentation is available [here][docs].
24+
25+
## Issue Tracking
26+
Report issues via the [Github Issues][github-issues]. Think you've found a bug?
27+
Please consider submitting a reproduction project via the a new [Github Issue][github-issues-new].
28+
29+
## Issue Pull Request
30+
[Pull requests](http://help.github.com/send-pull-requests) are welcome.
31+
32+
## Staying in Touch
33+
Hit us up on [Gitter][gitter].
34+
35+
## License
36+
The Testify is released under [Apache Software License, Version 2.0](LICENSE).
37+
38+
Enjoy and keep on Testifying!
39+
40+
41+
[docs]: http://fitburio.github.io/testify
42+
[examples]: https://github.com/testify-project/examples/tree/develop/examples
43+
[github-issues]: https://github.com/testify-project/examples/issues
44+
[github-issues-new]: https://github.com/testify-project/examples/issues/new
45+
[gitter]: https://gitter.im/testify-project/Lobby

‎RELEASING.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Releasing
2+
3+
## Versioning
4+
Testify has an automated release system and uses [Semantic Versioning](http://semver.org) version numbering system. Production release versions should conform semantic versioning scheme (i.e. 0.9.1) and development release version should conform semantic versioning scheme along with SNAPSHOT qualifier (i.e. 0.9.2-SNAPSHOT)
5+
6+
```
7+
major.minor.patch
8+
```
9+
10+
| number | meaning |
11+
| ------ | -------------------------------------------------------------------------- |
12+
| major | major version, with most probably incompatible change in API and behavior |
13+
| minor | minor version, important enough change to bump this number |
14+
| patch | a released build number incremented automatically a pull request is merged |
15+
16+
## Performing Release
17+
- Start release:
18+
```bash
19+
RELEASE_VERSION=x.x.x
20+
DEVELOPMENT_VERSION=x.x.x-SNAPSHOT
21+
$ git flow release start $RELEASE_VERSION
22+
```
23+
- Update the project version in pom files:
24+
```bash
25+
$ mvn versions:set -DnewVersion=$RELEASE_VERSION
26+
```
27+
- Update CHANGELOG.md:
28+
- Commit the changes:
29+
```bash
30+
$ git commit -m "Prepare release $RELEASE_VERSION" .
31+
```
32+
- Finish the release:
33+
```bash
34+
$ git flow release finish $RELEASE_VERSION
35+
```
36+
- Update next development project version in pom files:
37+
```bash
38+
$ mvn versions:set -DnewVersion=$DEVELOPMENT_VERSION
39+
```
40+
- Commit the updated pom files:
41+
```bash
42+
$ git commit -m "Updated next development version to $DEVELOPMENT_VERSION" .
43+
```
44+
- Push changes, develop, master branches and tags to remote repository:
45+
```bash
46+
$ git push origin develop master --tags
47+
```

‎archetype/junit-guice-integrationtest-archetype/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2016-2017 Sharmarke Aden.
4+
Copyright 2016-2017 Testify Project.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
22-
<groupId>org.testify-project.archetypes</groupId>
22+
<groupId>org.testifyproject.archetypes</groupId>
2323
<artifactId>archetypes</artifactId>
2424
<version>0.9.0-SNAPSHOT</version>
2525
</parent>
2626

2727
<artifactId>junit-guice-integrationtest-archetype</artifactId>
2828
<packaging>maven-archetype</packaging>
2929

30-
<name>Testify JUnit Guice Integration Test Archetype</name>
31-
<description>Creates a new quickstart project to integration test Google Guice modules and services with Testify, JUnit, Mockito, and AssertJ.</description>
30+
<name>Testify Project JUnit4 Guice Integration Test Archetype</name>
31+
<description>Creates a new quickstart project to integration test Google Guice modules and services with Testify, JUnit4, Mockito, and AssertJ.</description>
3232
<url>https://github.com/testify-project/examples/tree/master/junit/example-junit-guice-integrationtest</url>
3333

3434
</project>

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/pom.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2016-2017 Sharmarke Aden.
4+
Copyright 2016-2017 Testify Project.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -17,10 +17,13 @@
1717
1818
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
20+
2021
<artifactId>${artifactId}</artifactId>
22+
2123
<groupId>${groupId}</groupId>
22-
<name>Example JUnit Guice Integration Test</name>
23-
<description>Creates a new quickstart project to integration test Guice modules and services with Testify, JUnit, Mockito, and AssertJ.</description>
24+
25+
<name>Example JUnit4 Guice Integration Test</name>
26+
<description>Creates a new quickstart project to integration test Guice modules and services with Testify, JUnit4, Mockito, and AssertJ.</description>
2427
<version>${version}</version>
2528
<url>https://github.com/testify-project/examples/tree/master/junit/${artifactId}</url>
2629

@@ -84,25 +87,25 @@
8487
<dependencies>
8588
<!-- Testify Test Deps -->
8689
<dependency>
87-
<groupId>org.testify-project.junit</groupId>
90+
<groupId>org.testifyproject.junit4</groupId>
8891
<artifactId>guice-integration-test</artifactId>
8992
<version>${testify.version}</version>
9093
<scope>test</scope>
9194
</dependency>
9295
<dependency>
93-
<groupId>org.testify-project.resources</groupId>
96+
<groupId>org.testifyproject.resources</groupId>
9497
<artifactId>hsql</artifactId>
9598
<version>${resources.version}</version>
9699
<scope>test</scope>
97100
</dependency>
98101
<dependency>
99-
<groupId>org.testify-project.container</groupId>
102+
<groupId>org.testifyproject.container</groupId>
100103
<artifactId>docker</artifactId>
101104
<version>${testify.version}</version>
102105
<scope>test</scope>
103106
</dependency>
104107
<dependency>
105-
<groupId>org.testify-project.tools</groupId>
108+
<groupId>org.testifyproject.tools</groupId>
106109
<artifactId>test-logger</artifactId>
107110
<version>${testify.version}</version>
108111
<scope>test</scope>

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/GreetingsModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/database/PostgresDataSourceProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/greeting/CreateGreeting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/greeting/GetGreeting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/greeting/ListGreetings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/greeting/RemoveGreeting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/greeting/UpdateGreeting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/java/examples/greeting/entity/GreetingEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#set( $symbol_dollar = '$' )
33
#set( $symbol_escape = '\' )
44
/*
5-
* Copyright 2016-2017 Sharmarke Aden.
5+
* Copyright 2016-2017 Testify Project.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎archetype/junit-guice-integrationtest-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<?xml version="1.0" encoding="UTF-8"?>
55
<!--
66
7-
Copyright 2016-2017 Sharmarke Aden.
7+
Copyright 2016-2017 Testify Project.
88
99
Licensed under the Apache License, Version 2.0 (the "License");
1010
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)