Compare commits
5 Commits
edd516755a
...
issue-25/m
| Author | SHA1 | Date | |
|---|---|---|---|
| bd59c76c1a | |||
| 73156b69d7 | |||
| 2db2ed19a0 | |||
| 651cc4459e | |||
| ba37b199de |
30
.gitea/workflows/ci.yaml
Normal file
30
.gitea/workflows/ci.yaml
Normal file
@@ -0,0 +1,30 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
pull_request:
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
build-and-test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up JDK 16
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '16'
|
||||
distribution: 'temurin'
|
||||
|
||||
- name: Build and test with coverage
|
||||
run: ./mvnw verify --batch-mode
|
||||
|
||||
- name: Upload coverage report
|
||||
if: always()
|
||||
uses: https://gitea.com/actions/gitea-upload-artifact@v4
|
||||
with:
|
||||
name: jacoco-report
|
||||
path: target/site/jacoco/
|
||||
3
.mvn/wrapper/maven-wrapper.properties
vendored
Normal file
3
.mvn/wrapper/maven-wrapper.properties
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
wrapperVersion=3.3.4
|
||||
distributionType=only-script
|
||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
|
||||
@@ -1,388 +0,0 @@
|
||||
# Testing Strategy Handoff Document
|
||||
|
||||
**Project:** shapes - Java Shape Editor
|
||||
**Date:** March 27, 2026
|
||||
**Author:** AI Coding Orchestrator
|
||||
|
||||
---
|
||||
|
||||
## 1. Problem Statement
|
||||
|
||||
The objective was to explore the project, identify gaps in test coverage, and propose a testing strategy to improve code quality and reliability.
|
||||
|
||||
### Initial Questions
|
||||
- What is the current test coverage?
|
||||
- What classes/packages are tested vs. untested?
|
||||
- What is the recommended testing approach moving forward?
|
||||
|
||||
---
|
||||
|
||||
## 2. Project Overview
|
||||
|
||||
### Tech Stack
|
||||
- **Language:** Java 16
|
||||
- **Build Tool:** Maven
|
||||
- **Testing Framework:** JUnit 5 (Jupiter)
|
||||
- **Logging:** SLF4J + Logback
|
||||
|
||||
### Package Structure
|
||||
```
|
||||
src/main/java/ovh/gasser/newshapes/
|
||||
├── App.java # Main application entry
|
||||
├── Selection.java # Selection management
|
||||
├── ShapeVisitor.java # Visitor interface
|
||||
├── SVGExporter.java # SVG export logic
|
||||
├── HTMLExporter.java # HTML export logic
|
||||
├── shapes/
|
||||
│ ├── Shape.java # Shape interface
|
||||
│ ├── AbstractShape.java # Base abstract class
|
||||
│ ├── SRectangle.java # Rectangle shape
|
||||
│ ├── SCircle.java # Circle shape
|
||||
│ ├── STriangle.java # Triangle shape
|
||||
│ ├── SText.java # Text shape
|
||||
│ ├── SCollection.java # Shape collection (composite)
|
||||
│ └── ResizeHandle.java # Resize handle enum
|
||||
├── attributes/
|
||||
│ ├── Attributes.java # Base attributes interface
|
||||
│ ├── SelectionAttributes.java # Selection state
|
||||
│ └── ColorAttributes.java # Fill/stroke colors
|
||||
├── ui/
|
||||
│ ├── Controller.java # Main controller
|
||||
│ ├── ShapesView.java # View component
|
||||
│ ├── ShapeDraftman.java # Drawing component
|
||||
│ ├── listeners/
|
||||
│ │ ├── MenuAddListener.java
|
||||
│ │ ├── MenuEditListener.java
|
||||
│ │ └── SelectionListener.java
|
||||
│ └── visitors/
|
||||
│ ├── SVGDraftman.java # SVG visitor implementation
|
||||
│ └── HTMLDraftman.java # HTML visitor implementation
|
||||
└── util/
|
||||
└── Streamable.java # Stream support interface
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Initial Exploration Findings
|
||||
|
||||
### 3.1 Existing Test Coverage (Before Work)
|
||||
|
||||
| Test File | Coverage |
|
||||
|-----------|----------|
|
||||
| AbstractShapeTest.java | Partial (6 tests) |
|
||||
| SRectangleTest.java | ✅ |
|
||||
| SCircleTest.java | ✅ |
|
||||
| STriangleTest.java | ✅ |
|
||||
| STextTest.java | ✅ |
|
||||
| SVGExporterTest.java | ✅ |
|
||||
| HTMLExporterTest.java | ✅ |
|
||||
|
||||
**Total: 36 tests across 7 test classes**
|
||||
|
||||
### 3.2 Classes with NO Tests
|
||||
|
||||
| Priority | Class | Reason for Testing Need |
|
||||
|----------|-------|------------------------|
|
||||
| 🔴 High | SCollection | Core composite pattern, child management, bounds calculation |
|
||||
| 🔴 High | Selection | Critical selection management, listener notifications |
|
||||
| 🔴 High | Streamable | Interface with default method used throughout |
|
||||
| 🟡 Medium | SelectionAttributes | Core data type |
|
||||
| 🟡 Medium | ColorAttributes | Core data type |
|
||||
| 🟡 Medium | SVGDraftman | Complex string generation |
|
||||
| 🟡 Medium | HTMLDraftman | Complex string generation |
|
||||
| 🟢 Low | Controller | UI logic, integration points |
|
||||
| 🟢 Low | ShapeDraftman | UI rendering |
|
||||
| 🟢 Low | ShapesView | UI component |
|
||||
|
||||
### 3.3 Issues in Existing Tests
|
||||
|
||||
1. **Shallow coverage** - Most shape tests only verify creation and bounds
|
||||
2. **No edge cases** - Missing: null handling, negative coordinates, zero dimensions
|
||||
3. **Reflection usage** - SCircleTest uses reflection to check color (fragile)
|
||||
4. **No contract tests** - Shape interface has no tests verifying invariants
|
||||
5. **Inconsistent clone testing** - Some tests verify deep copy, others don't
|
||||
|
||||
---
|
||||
|
||||
## 4. Work Completed
|
||||
|
||||
### 4.1 Tests Added
|
||||
|
||||
Three new test files created with 21 new tests:
|
||||
|
||||
#### SCollectionTest.java (12 tests)
|
||||
```java
|
||||
src/test/java/ovh/gasser/newshapes/shapes/SCollectionTest.java
|
||||
```
|
||||
|
||||
| Test Method | Purpose |
|
||||
|-------------|---------|
|
||||
| testCreateWithShapes | Verify SCollection.of() creates collection with shapes |
|
||||
| testAdd | Verify add() adds a shape to the collection |
|
||||
| testRemove | Verify remove() removes a shape from the collection |
|
||||
| testIterator | Verify iterator() iterates over children |
|
||||
| testStream | Verify stream() returns a stream of children |
|
||||
| testGetBoundsEmptyCollection | Verify getBounds() returns Rectangle(WIN_SIZE) when empty |
|
||||
| testGetBoundsWithChildren | Verify getBounds() returns union of all children's bounds |
|
||||
| testTranslate | Verify translate() moves all children |
|
||||
| testClone | Verify clone() creates deep copy with SelectionAttributes |
|
||||
| testToString | Verify toString() contains SCollection |
|
||||
| testAddAttributesPropagatesToChildren | Verify ColorAttributes are propagated to children |
|
||||
| testGetAttributesReturnsChildColor | Verify getAttributes(ColorAttributes.ID) returns first child's color |
|
||||
|
||||
#### SelectionTest.java (7 tests)
|
||||
```java
|
||||
src/test/java/ovh/gasser/newshapes/SelectionTest.java
|
||||
```
|
||||
|
||||
| Test Method | Purpose |
|
||||
|-------------|---------|
|
||||
| testIsEmptyInitially | Verify isEmpty() returns true initially |
|
||||
| testAdd | Verify add() adds shape and marks it selected |
|
||||
| testAddAll | Verify addAll() adds multiple shapes |
|
||||
| testClear | Verify clear() removes all shapes and marks them unselected |
|
||||
| testGetSelectedShapesReturnsCopy | Verify getSelectedShapes() returns immutable copy |
|
||||
| testAddListener | Verify addListener() and listener notification |
|
||||
| testNullAddAllDoesNothing | Verify addAll(null) doesn't throw |
|
||||
|
||||
#### StreamableTest.java (2 tests)
|
||||
```java
|
||||
src/test/java/ovh/gasser/newshapes/util/StreamableTest.java
|
||||
```
|
||||
|
||||
| Test Method | Purpose |
|
||||
|-------------|---------|
|
||||
| testStreamReturnsStreamOfElements | Verify stream() returns all elements |
|
||||
| testStreamEmptyCollection | Verify stream() works on empty collection |
|
||||
|
||||
### 4.2 Test Results
|
||||
|
||||
```
|
||||
Tests run: 57, Failures: 0, Errors: 0, Skipped: 0
|
||||
BUILD SUCCESS
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. Oracle Strategic Review
|
||||
|
||||
Consulted @oracle for architectural guidance on testing strategy.
|
||||
|
||||
### 5.1 Assessment
|
||||
|
||||
**Overall Grade: B- (Adequate but shallow)**
|
||||
|
||||
| Area | Coverage | Quality |
|
||||
|------|----------|---------|
|
||||
| Shapes | ~60% | Basic happy-path only |
|
||||
| SCollection | Good | Decent coverage including edge cases |
|
||||
| Selection | Good | Tests core behavior + listeners |
|
||||
| Exporters | Good | Structure + format validation |
|
||||
| AbstractShape | Good | Tests polymorphic behavior |
|
||||
|
||||
### 5.2 Recommended Priority
|
||||
|
||||
| Priority | Area | Rationale |
|
||||
|----------|------|-----------|
|
||||
| P0 | Attributes tests | SelectionAttributes, ColorAttributes - core data types |
|
||||
| P1 | Visitor tests | SVGDraftman/HTMLDraftman - complex string generation |
|
||||
| P1 | contains(Point) | Critical hit-testing behavior |
|
||||
| P2 | UI tests | Controller integration points |
|
||||
| P2 | Edge cases | Zero dimensions, negative coords, null handling |
|
||||
| P3 | ResizeHandle | All 8 handles should be tested |
|
||||
|
||||
### 5.3 CI/CD Recommendations
|
||||
|
||||
1. **Add JaCoCo** - Enforce 80% code coverage
|
||||
2. **Parallel tests** - Enable parallel test execution in surefire
|
||||
3. **GitHub Actions** - Add CI pipeline
|
||||
|
||||
---
|
||||
|
||||
## 6. Visitor Testing Approach (@oracle)
|
||||
|
||||
### 6.1 Why Direct Visitor Tests?
|
||||
|
||||
Current exporter tests obscure visitor logic in the full pipeline. Direct tests provide:
|
||||
- **Isolation** - Tests fail at specific visitor method
|
||||
- **Faster feedback** - No complex shape construction needed
|
||||
- **Edge case targeting** - Test specific attribute combinations
|
||||
|
||||
### 6.2 Recommended Structure
|
||||
|
||||
```
|
||||
src/test/java/ovh/gasser/newshapes/ui/visitors/
|
||||
├── SVGDraftmanTest.java # Direct visitor tests
|
||||
└── HTMLDraftmanTest.java
|
||||
```
|
||||
|
||||
### 6.3 Assertions Strategy
|
||||
|
||||
| Use Exact Match For | Use Contains/Partial For |
|
||||
|---------------------|---------------------------|
|
||||
| Element tags (`<rect>`, `<circle>`) | Dynamic values (coords, colors) |
|
||||
| Fixed attributes (xmlns, DOCTYPE) | CSS output ordering |
|
||||
| Structure markers | |
|
||||
|
||||
### 6.4 Edge Cases to Cover
|
||||
|
||||
- Null ColorAttributes
|
||||
- Filled only / stroked only / both / neither
|
||||
- Empty collections
|
||||
- Nested SCollection
|
||||
- Text font styles (ITALIC, BOLD, ITALIC+BOLD)
|
||||
|
||||
### 6.5 Bug Found 🐛
|
||||
|
||||
**HTMLDraftman.visitTriangle()** line 69:
|
||||
```java
|
||||
htmlOutput.printf("<div class=\"triangle%d\"></div>\n", this.hashCode()); // BUG
|
||||
```
|
||||
Should be `sTriangle.hashCode()`. Direct visitor tests would catch this.
|
||||
|
||||
---
|
||||
|
||||
## 7. Remaining Work
|
||||
|
||||
### 7.1 High Priority
|
||||
|
||||
| # | Task | Estimated Effort |
|
||||
|---|------|-----------------|
|
||||
| 1 | Add SelectionAttributes test | 1 hour |
|
||||
| 2 | Add ColorAttributes test | 1 hour |
|
||||
| 3 | Create ShapeContractTest (parameterized) | 2 hours |
|
||||
|
||||
### 7.2 Medium Priority
|
||||
|
||||
| # | Task | Estimated Effort |
|
||||
|---|------|-----------------|
|
||||
| 4 | Add SVGDraftmanTest | 2 hours |
|
||||
| 5 | Add HTMLDraftmanTest | 2 hours |
|
||||
| 6 | Add contains(Point) tests | 2-3 hours |
|
||||
|
||||
### 7.3 Lower Priority
|
||||
|
||||
| # | Task | Estimated Effort |
|
||||
|---|------|-----------------|
|
||||
| 7 | Add ResizeHandle tests | 1 hour |
|
||||
| 8 | Add edge case tests (null, negative, zero) | 2 hours |
|
||||
| 9 | Fix HTMLDraftman.visitTriangle() bug | 30 min |
|
||||
| 10 | Set up JaCoCo + CI | 1 hour |
|
||||
|
||||
---
|
||||
|
||||
## 8. Appendix
|
||||
|
||||
### A. Current Test Files
|
||||
|
||||
```
|
||||
src/test/java/ovh/gasser/newshapes/
|
||||
├── shapes/
|
||||
│ ├── AbstractShapeTest.java # 6 tests
|
||||
│ ├── SRectangleTest.java # 4 tests
|
||||
│ ├── SCircleTest.java # 5 tests
|
||||
│ ├── STriangleTest.java # 3 tests
|
||||
│ ├── STextTest.java # 5 tests
|
||||
│ └── SCollectionTest.java # 12 tests (NEW)
|
||||
├── exporters/
|
||||
│ ├── SVGExporterTest.java # 7 tests
|
||||
│ └── HTMLExporterTest.java # 6 tests
|
||||
├── SelectionTest.java # 7 tests (NEW)
|
||||
└── util/
|
||||
└── StreamableTest.java # 2 tests (NEW)
|
||||
```
|
||||
|
||||
### B. Maven Dependencies
|
||||
|
||||
```xml
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.10.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<version>5.10.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
### C. JaCoCo Configuration (Recommended)
|
||||
|
||||
```xml
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.11</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
<goal>report</goal>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<rules>
|
||||
<rule>
|
||||
<element>CLASS</element>
|
||||
<limits>
|
||||
<limit>
|
||||
<counter>LINE</counter>
|
||||
<value>COVEREDRATIO</value>
|
||||
<minimum>0.80</minimum>
|
||||
</limit>
|
||||
</limits>
|
||||
</rule>
|
||||
</rules>
|
||||
</configuration>
|
||||
</plugin>
|
||||
```
|
||||
|
||||
### D. Shape Contract Test (Recommended Pattern)
|
||||
|
||||
```java
|
||||
class ShapeContractTest {
|
||||
@ParameterizedTest
|
||||
@MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
|
||||
void testCloneIsIndependent(Shape s) { ... }
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
|
||||
void testGetBoundsReturnsCopy(Shape s) { ... }
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("ovh.gasser.newshapes.shapes.ShapeFactory#allShapes")
|
||||
void testTranslateMutatesInPlace(Shape s) { ... }
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 9. Summary
|
||||
|
||||
| Metric | Before | After |
|
||||
|--------|--------|-------|
|
||||
| Total Tests | 36 | 57 |
|
||||
| Test Classes | 7 | 10 |
|
||||
| Core Classes Tested | 8 | 11 |
|
||||
| Coverage Grade | C | B- |
|
||||
|
||||
**Key Achievements:**
|
||||
- Identified and filled gaps in core business logic (SCollection, Selection, Streamable)
|
||||
- Received architectural guidance from @oracle
|
||||
- Discovered potential bug in HTMLDraftman
|
||||
- Established clear roadmap for remaining work
|
||||
|
||||
**Next Steps:**
|
||||
1. Add Attributes tests (SelectionAttributes, ColorAttributes)
|
||||
2. Add visitor tests (SVGDraftman, HTMLDraftman)
|
||||
3. Add Shape contract tests
|
||||
4. Set up CI/CD with JaCoCo coverage gate
|
||||
|
||||
---
|
||||
|
||||
*End of Handoff Document*
|
||||
295
mvnw
vendored
Executable file
295
mvnw
vendored
Executable file
@@ -0,0 +1,295 @@
|
||||
#!/bin/sh
|
||||
# ----------------------------------------------------------------------------
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Apache Maven Wrapper startup batch script, version 3.3.4
|
||||
#
|
||||
# Optional ENV vars
|
||||
# -----------------
|
||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
set -euf
|
||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
||||
|
||||
# OS specific support.
|
||||
native_path() { printf %s\\n "$1"; }
|
||||
case "$(uname)" in
|
||||
CYGWIN* | MINGW*)
|
||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
||||
native_path() { cygpath --path --windows "$1"; }
|
||||
;;
|
||||
esac
|
||||
|
||||
# set JAVACMD and JAVACCMD
|
||||
set_java_home() {
|
||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
||||
if [ -n "${JAVA_HOME-}" ]; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
||||
|
||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
else
|
||||
JAVACMD="$(
|
||||
'set' +e
|
||||
'unset' -f command 2>/dev/null
|
||||
'command' -v java
|
||||
)" || :
|
||||
JAVACCMD="$(
|
||||
'set' +e
|
||||
'unset' -f command 2>/dev/null
|
||||
'command' -v javac
|
||||
)" || :
|
||||
|
||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# hash string like Java String::hashCode
|
||||
hash_string() {
|
||||
str="${1:-}" h=0
|
||||
while [ -n "$str" ]; do
|
||||
char="${str%"${str#?}"}"
|
||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
||||
str="${str#?}"
|
||||
done
|
||||
printf %x\\n $h
|
||||
}
|
||||
|
||||
verbose() { :; }
|
||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
||||
|
||||
die() {
|
||||
printf %s\\n "$1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
trim() {
|
||||
# MWRAPPER-139:
|
||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
||||
# Needed for removing poorly interpreted newline sequences when running in more
|
||||
# exotic environments such as mingw bash on Windows.
|
||||
printf "%s" "${1}" | tr -d '[:space:]'
|
||||
}
|
||||
|
||||
scriptDir="$(dirname "$0")"
|
||||
scriptName="$(basename "$0")"
|
||||
|
||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
||||
while IFS="=" read -r key value; do
|
||||
case "${key-}" in
|
||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
||||
esac
|
||||
done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||
|
||||
case "${distributionUrl##*/}" in
|
||||
maven-mvnd-*bin.*)
|
||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
||||
*)
|
||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
||||
distributionPlatform=linux-amd64
|
||||
;;
|
||||
esac
|
||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
||||
;;
|
||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
||||
*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
||||
esac
|
||||
|
||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
||||
distributionUrlName="${distributionUrl##*/}"
|
||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
||||
|
||||
exec_maven() {
|
||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
||||
}
|
||||
|
||||
if [ -d "$MAVEN_HOME" ]; then
|
||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||
exec_maven "$@"
|
||||
fi
|
||||
|
||||
case "${distributionUrl-}" in
|
||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
||||
esac
|
||||
|
||||
# prepare tmp dir
|
||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
||||
trap clean HUP INT TERM EXIT
|
||||
else
|
||||
die "cannot create temp dir"
|
||||
fi
|
||||
|
||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
||||
|
||||
# Download and Install Apache Maven
|
||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||
verbose "Downloading from: $distributionUrl"
|
||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
|
||||
# select .zip or .tar.gz
|
||||
if ! command -v unzip >/dev/null; then
|
||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
||||
distributionUrlName="${distributionUrl##*/}"
|
||||
fi
|
||||
|
||||
# verbose opt
|
||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
||||
|
||||
# normalize http auth
|
||||
case "${MVNW_PASSWORD:+has-password}" in
|
||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||
esac
|
||||
|
||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
||||
verbose "Found wget ... using wget"
|
||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
||||
verbose "Found curl ... using curl"
|
||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
||||
elif set_java_home; then
|
||||
verbose "Falling back to use Java to download"
|
||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
cat >"$javaSource" <<-END
|
||||
public class Downloader extends java.net.Authenticator
|
||||
{
|
||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
||||
{
|
||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
||||
}
|
||||
public static void main( String[] args ) throws Exception
|
||||
{
|
||||
setDefault( new Downloader() );
|
||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
||||
}
|
||||
}
|
||||
END
|
||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
||||
verbose " - Compiling Downloader.java ..."
|
||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
||||
verbose " - Running Downloader.java ..."
|
||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
||||
fi
|
||||
|
||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||
if [ -n "${distributionSha256Sum-}" ]; then
|
||||
distributionSha256Result=false
|
||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||
exit 1
|
||||
elif command -v sha256sum >/dev/null; then
|
||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
|
||||
distributionSha256Result=true
|
||||
fi
|
||||
elif command -v shasum >/dev/null; then
|
||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
||||
distributionSha256Result=true
|
||||
fi
|
||||
else
|
||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||
exit 1
|
||||
fi
|
||||
if [ $distributionSha256Result = false ]; then
|
||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# unzip and move
|
||||
if command -v unzip >/dev/null; then
|
||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
||||
else
|
||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
||||
fi
|
||||
|
||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
||||
actualDistributionDir=""
|
||||
|
||||
# First try the expected directory name (for regular distributions)
|
||||
if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
|
||||
if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
|
||||
actualDistributionDir="$distributionUrlNameMain"
|
||||
fi
|
||||
fi
|
||||
|
||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
||||
if [ -z "$actualDistributionDir" ]; then
|
||||
# enable globbing to iterate over items
|
||||
set +f
|
||||
for dir in "$TMP_DOWNLOAD_DIR"/*; do
|
||||
if [ -d "$dir" ]; then
|
||||
if [ -f "$dir/bin/$MVN_CMD" ]; then
|
||||
actualDistributionDir="$(basename "$dir")"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
set -f
|
||||
fi
|
||||
|
||||
if [ -z "$actualDistributionDir" ]; then
|
||||
verbose "Contents of $TMP_DOWNLOAD_DIR:"
|
||||
verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
|
||||
die "Could not find Maven distribution directory in extracted archive"
|
||||
fi
|
||||
|
||||
verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
|
||||
mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
||||
|
||||
clean || :
|
||||
exec_maven "$@"
|
||||
34
pom.xml
34
pom.xml
@@ -25,6 +25,40 @@
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.2.5</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.11</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
<goal>report</goal>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<!-- UI classes require a display and cannot be unit-tested -->
|
||||
<exclude>ovh/gasser/newshapes/App.class</exclude>
|
||||
<exclude>ovh/gasser/newshapes/ui/**</exclude>
|
||||
<exclude>ovh/gasser/newshapes/Selection.class</exclude>
|
||||
</excludes>
|
||||
<rules>
|
||||
<rule>
|
||||
<element>BUNDLE</element>
|
||||
<limits>
|
||||
<limit>
|
||||
<counter>LINE</counter>
|
||||
<value>COVEREDRATIO</value>
|
||||
<minimum>0.50</minimum>
|
||||
</limit>
|
||||
</limits>
|
||||
</rule>
|
||||
</rules>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user