Skip to content

Commit 9096cbe

Browse files
committed
fixes (forget mockito)
1 parent 3e23b70 commit 9096cbe

4 files changed

Lines changed: 171 additions & 17 deletions

File tree

api/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
<groupId>org.slf4j</groupId>
2323
<artifactId>slf4j-api</artifactId>
2424
</dependency>
25-
<dependency>
26-
<groupId>org.mockito</groupId>
27-
<artifactId>mockito-junit-jupiter</artifactId>
28-
<scope>test</scope>
29-
</dependency>
3025
</dependencies>
3126

3227
</project>

api/src/test/java/io/github/mmm/code/api/language/JavaLanguageTest.java

Lines changed: 168 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@
22
* http://www.apache.org/licenses/LICENSE-2.0 */
33
package io.github.mmm.code.api.language;
44

5+
import java.nio.charset.Charset;
6+
import java.nio.file.Path;
7+
58
import org.assertj.core.api.Assertions;
69
import org.junit.jupiter.api.Test;
7-
import org.mockito.Mockito;
810

11+
import io.github.mmm.code.api.CodeContext;
912
import io.github.mmm.code.api.CodePackage;
13+
import io.github.mmm.code.api.CodePathElements;
14+
import io.github.mmm.code.api.annotation.CodeAnnotations;
15+
import io.github.mmm.code.api.comment.CodeComment;
16+
import io.github.mmm.code.api.copy.CodeCopyMapper;
17+
import io.github.mmm.code.api.doc.CodeDoc;
18+
import io.github.mmm.code.api.node.CodeContainer;
19+
import io.github.mmm.code.api.source.CodeSource;
1020
import io.github.mmm.code.api.type.CodeTypeCategory;
1121

1222
/**
@@ -53,9 +63,9 @@ public void testPackageNaming() {
5363
CodeLanguage language = JavaLanguage.get();
5464

5565
// when
56-
CodePackage pkgRoot = Mockito.mock(CodePackage.class);
57-
CodePackage pkg = Mockito.mock(CodePackage.class);
58-
Mockito.when(pkg.getParentPackage()).thenReturn(pkgRoot);
66+
CodePackage pkgRoot = new CodePackageMock("com");
67+
CodePackage pkg = new CodePackageMock(pkgRoot, "foo");
68+
// Mockito.when(pkg.getParentPackage()).thenReturn(pkgRoot);
5969

6070
// then
6171
// valid package names
@@ -110,4 +120,158 @@ private void verifyPackageName(CodeLanguage language, CodePackage pkg, String si
110120
}
111121
}
112122

123+
private class CodePackageMock implements CodePackage {
124+
125+
private CodePackage parent;
126+
127+
private String simpleName;
128+
129+
CodePackageMock(String simpleName) {
130+
131+
this(null, simpleName);
132+
}
133+
134+
CodePackageMock(CodePackage parent, String simpleName) {
135+
136+
super();
137+
this.parent = parent;
138+
this.simpleName = simpleName;
139+
}
140+
141+
@Override
142+
public boolean isFile() {
143+
144+
return false;
145+
}
146+
147+
@Override
148+
public CodeDoc getDoc() {
149+
150+
return null;
151+
}
152+
153+
@Override
154+
public CodeAnnotations getAnnotations() {
155+
156+
return null;
157+
}
158+
159+
@Override
160+
public void removeFromParent() {
161+
162+
}
163+
164+
@Override
165+
public void setComment(CodeComment comment) {
166+
167+
}
168+
169+
@Override
170+
public CodeComment getComment() {
171+
172+
return null;
173+
}
174+
175+
@Override
176+
public CodePackageMock copy(CodeCopyMapper mapper) {
177+
178+
return null;
179+
}
180+
181+
@Override
182+
public void setImmutable() {
183+
184+
}
185+
186+
@Override
187+
public void write(Appendable sink, String newline, String defaultIndent, String currentIndent,
188+
CodeLanguage language) {
189+
190+
}
191+
192+
@Override
193+
public String getSourceCode() {
194+
195+
return null;
196+
}
197+
198+
@Override
199+
public void write(Path targetFolder) {
200+
201+
}
202+
203+
@Override
204+
public void write(Path targetFolder, Charset encoding) {
205+
206+
}
207+
208+
@Override
209+
public CodePackage getParentPackage() {
210+
211+
return this.parent;
212+
}
213+
214+
@Override
215+
public String getSimpleName() {
216+
217+
return this.simpleName;
218+
}
219+
220+
@Override
221+
public CodeContext getContext() {
222+
223+
return null;
224+
}
225+
226+
@Override
227+
public CodeSource getSource() {
228+
229+
return null;
230+
}
231+
232+
@Override
233+
public boolean isImmutable() {
234+
235+
return false;
236+
}
237+
238+
@Override
239+
public CodeContainer getParent() {
240+
241+
return this.parent;
242+
}
243+
244+
@Override
245+
public CodePathElements getChildren() {
246+
247+
// TODO Auto-generated method stub
248+
return null;
249+
}
250+
251+
@Override
252+
public boolean isRequireImport() {
253+
254+
return false;
255+
}
256+
257+
@Override
258+
public boolean isRoot() {
259+
260+
return this.parent == null;
261+
}
262+
263+
@Override
264+
public Package getReflectiveObject() {
265+
266+
return null;
267+
}
268+
269+
@Override
270+
public CodePackage copy() {
271+
272+
return null;
273+
}
274+
275+
}
276+
113277
}

java/maven/src/test/java/io/github/mmm/code/java/maven/impl/MavenBridgeImplTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ public void testReadProject() {
9090
assertThat(model.getVersion()).matches(VERSION_PATTERN);
9191
verifyDependencies(model, DependencyHelper.create(groupId, "mmm-code-base", "*"),
9292
DependencyHelper.create("org.apache.maven", "maven-core", "3.9.6"),
93-
DependencyHelper.create("org.assertj", "assertj-core", "3.26.3", SCOPE_TEST),
94-
DependencyHelper.create("org.junit.jupiter", "junit-jupiter", "5.10.3", SCOPE_TEST),
95-
DependencyHelper.create("ch.qos.logback", "logback-classic", "1.5.6", SCOPE_TEST));
93+
DependencyHelper.create("org.assertj", "assertj-core", "3.27.6", SCOPE_TEST),
94+
DependencyHelper.create("org.junit.jupiter", "junit-jupiter", "6.0.1", SCOPE_TEST),
95+
DependencyHelper.create("ch.qos.logback", "logback-classic", "1.5.21", SCOPE_TEST));
9696
}
9797

9898
private void verifyDependencies(Model model, Dependency... dependencies) {

pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@
3939
<artifactId>maven-core</artifactId>
4040
<version>${maven.version}</version>
4141
</dependency>
42-
<dependency>
43-
<groupId>org.mockito</groupId>
44-
<artifactId>mockito-junit-jupiter</artifactId>
45-
<version>5.10.0</version>
46-
</dependency>
4742
<!-- Internal dependencies -->
4843
<dependency>
4944
<groupId>${project.groupId}</groupId>

0 commit comments

Comments
 (0)