Skip to content

Commit 8d5bc58

Browse files
davidkoppdavidkopp
committed
Cleanup
1 parent 234191e commit 8d5bc58

File tree

2 files changed

+45
-76
lines changed

2 files changed

+45
-76
lines changed

‎tests/detectors/maven/test_data/simple-project-pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<groupId>com.example</groupId>
9+
<artifactId>test-project</artifactId>
10+
<version>1.0.0</version>
11+
<packaging>jar</packaging>
12+
13+
<properties>
14+
<maven.compiler.source>17</maven.compiler.source>
15+
<maven.compiler.target>17</maven.compiler.target>
16+
<junit.version>5.9.0</junit.version>
17+
</properties>
18+
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.junit.jupiter</groupId>
22+
<artifactId>junit-jupiter</artifactId>
23+
<version>${junit.version}</version>
24+
<scope>test</scope>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.fasterxml.jackson.core</groupId>
28+
<artifactId>jackson-core</artifactId>
29+
<version>2.15.2</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.apache.commons</groupId>
33+
<artifactId>commons-lang3</artifactId>
34+
<version>3.12.0</version>
35+
</dependency>
36+
</dependencies>
37+
</project>

‎tests/detectors/maven/test_maven_docker_detection.py‎

Lines changed: 8 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -156,44 +156,10 @@ def _create_test_maven_project(self, executor: DockerExecutor) -> None:
156156
# Create project directory
157157
executor.execute_command("mkdir -p /tmp/test-maven-project")
158158

159-
# Create a sample pom.xml
160-
pom_content = """<?xml version="1.0" encoding="UTF-8"?>
161-
<project xmlns="http://maven.apache.org/POM/4.0.0"
162-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
163-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
164-
http://maven.apache.org/xsd/maven-4.0.0.xsd">
165-
<modelVersion>4.0.0</modelVersion>
166-
167-
<groupId>com.example</groupId>
168-
<artifactId>test-project</artifactId>
169-
<version>1.0.0</version>
170-
<packaging>jar</packaging>
171-
172-
<properties>
173-
<maven.compiler.source>17</maven.compiler.source>
174-
<maven.compiler.target>17</maven.compiler.target>
175-
<junit.version>5.9.0</junit.version>
176-
</properties>
177-
178-
<dependencies>
179-
<dependency>
180-
<groupId>org.junit.jupiter</groupId>
181-
<artifactId>junit-jupiter</artifactId>
182-
<version>${junit.version}</version>
183-
<scope>test</scope>
184-
</dependency>
185-
<dependency>
186-
<groupId>com.fasterxml.jackson.core</groupId>
187-
<artifactId>jackson-core</artifactId>
188-
<version>2.15.2</version>
189-
</dependency>
190-
<dependency>
191-
<groupId>org.apache.commons</groupId>
192-
<artifactId>commons-lang3</artifactId>
193-
<version>3.12.0</version>
194-
</dependency>
195-
</dependencies>
196-
</project>"""
159+
# Read pom.xml from external file
160+
pom_path = os.path.join(os.path.dirname(__file__), "test_data", "simple-project-pom.xml")
161+
with open(pom_path, "r", encoding="utf-8") as f:
162+
pom_content = f.read()
197163

198164
# Write pom.xml
199165
executor.execute_command(f"cat > /tmp/test-maven-project/pom.xml << 'EOF'\n{pom_content}\nEOF")
@@ -230,44 +196,10 @@ def _create_test_maven_project_without_maven(self, executor: DockerExecutor) ->
230196
# Create project directory
231197
executor.execute_command("mkdir -p /tmp/test-maven-project")
232198

233-
# Create the same pom.xml as above
234-
pom_content = """<?xml version="1.0" encoding="UTF-8"?>
235-
<project xmlns="http://maven.apache.org/POM/4.0.0"
236-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
237-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
238-
http://maven.apache.org/xsd/maven-4.0.0.xsd">
239-
<modelVersion>4.0.0</modelVersion>
240-
241-
<groupId>com.example</groupId>
242-
<artifactId>test-project</artifactId>
243-
<version>1.0.0</version>
244-
<packaging>jar</packaging>
245-
246-
<properties>
247-
<maven.compiler.source>17</maven.compiler.source>
248-
<maven.compiler.target>17</maven.compiler.target>
249-
<junit.version>5.9.0</junit.version>
250-
</properties>
251-
252-
<dependencies>
253-
<dependency>
254-
<groupId>org.junit.jupiter</groupId>
255-
<artifactId>junit-jupiter</artifactId>
256-
<version>${junit.version}</version>
257-
<scope>test</scope>
258-
</dependency>
259-
<dependency>
260-
<groupId>com.fasterxml.jackson.core</groupId>
261-
<artifactId>jackson-core</artifactId>
262-
<version>2.15.2</version>
263-
</dependency>
264-
<dependency>
265-
<groupId>org.apache.commons</groupId>
266-
<artifactId>commons-lang3</artifactId>
267-
<version>3.12.0</version>
268-
</dependency>
269-
</dependencies>
270-
</project>"""
199+
# Read pom.xml from external file
200+
pom_path = os.path.join(os.path.dirname(__file__), "test_data", "simple-project-pom.xml")
201+
with open(pom_path, "r", encoding="utf-8") as f:
202+
pom_content = f.read()
271203

272204
# Write pom.xml
273205
executor.execute_command(f"cat > /tmp/test-maven-project/pom.xml << 'EOF'\n{pom_content}\nEOF")

0 commit comments

Comments
 (0)