Skip to content

Commit bb24e78

Browse files
jeffmauryangelozerr
authored andcommitted
fix(test): export tests and refactor QuteProjectTest utility
Fixes #573 Signed-off-by: Jeff MAURY <jmaury@redhat.com>
1 parent 3ff7394 commit bb24e78

File tree

9 files changed

+26
-21
lines changed

9 files changed

+26
-21
lines changed

qute.jdt/com.redhat.qute.jdt.test/META-INF/MANIFEST.MF

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ Require-Bundle: org.junit,
2525
org.eclipse.m2e.lifecyclemapping.defaults
2626
Import-Package: com.google.gson
2727
Bundle-ActivationPolicy: lazy
28+
Export-Package: com.redhat.qute.jdt,
29+
com.redhat.qute.jdt.java,
30+
com.redhat.qute.jdt.template

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/ClasspathTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1515

1616
import org.eclipse.core.runtime.CoreException;
1717
import org.eclipse.jdt.core.IJavaProject;
1818
import org.eclipse.jdt.core.IType;
1919
import org.junit.Assert;
2020
import org.junit.Test;
2121

22-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
22+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
2323

2424
/**
2525
* Test classpath.

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/internal/QuteProjectTest.java renamed to qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/QuteProjectTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Contributors:
1010
* Red Hat Inc. - initial API and implementation
1111
*******************************************************************************/
12-
package com.redhat.qute.jdt.internal;
12+
package com.redhat.qute.jdt;
1313

1414
import java.io.ByteArrayInputStream;
1515
import java.io.File;
@@ -38,6 +38,8 @@
3838
import org.junit.AfterClass;
3939
import org.junit.BeforeClass;
4040

41+
import com.redhat.qute.jdt.internal.JavaUtils;
42+
import com.redhat.qute.jdt.internal.JobHelpers;
4143
import com.redhat.qute.jdt.internal.ls.JDTUtilsLSImpl;
4244
import com.redhat.qute.jdt.utils.IJDTUtils;
4345

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/java/JavaCodeLensTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt.java;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.getJDTUtils;
15-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.getJDTUtils;
15+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1616
import static org.junit.Assert.assertEquals;
1717

1818
import java.util.Arrays;
@@ -35,7 +35,7 @@
3535

3636
import com.redhat.qute.commons.QuteJavaCodeLensParams;
3737
import com.redhat.qute.jdt.QuteSupportForJava;
38-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
38+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
3939

4040
/**
4141
* Tests for Qute @CheckedTemplate support code lens inside Java files.

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/java/JavaDiagnosticsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt.java;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.getJDTUtils;
15-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.getJDTUtils;
15+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1616
import static org.junit.Assert.assertEquals;
1717

1818
import java.util.Arrays;
@@ -36,7 +36,7 @@
3636

3737
import com.redhat.qute.commons.QuteJavaDiagnosticsParams;
3838
import com.redhat.qute.jdt.QuteSupportForJava;
39-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
39+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
4040
import com.redhat.qute.jdt.internal.java.QuteErrorCode;
4141

4242
/**

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/java/JavaDocumentLinkTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt.java;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.getJDTUtils;
15-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.getJDTUtils;
15+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1616
import static org.junit.Assert.assertEquals;
1717

1818
import java.util.List;
@@ -33,7 +33,7 @@
3333

3434
import com.redhat.qute.commons.QuteJavaDocumentLinkParams;
3535
import com.redhat.qute.jdt.QuteSupportForJava;
36-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
36+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
3737

3838
/**
3939
* Tests for Qute @CheckedTemplate support document link inside Java files.

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetDataModelProjectTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt.template;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.getJDTUtils;
15-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.getJDTUtils;
15+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1616

1717
import java.util.List;
1818
import java.util.Optional;
@@ -27,7 +27,7 @@
2727
import com.redhat.qute.commons.datamodel.DataModelTemplate;
2828
import com.redhat.qute.commons.datamodel.QuteDataModelProjectParams;
2929
import com.redhat.qute.jdt.QuteSupportForTemplate;
30-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
30+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
3131

3232
/**
3333
* Tests for

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetJavaTypeTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt.template;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.getJDTUtils;
15-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.getJDTUtils;
15+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1616

1717
import java.util.List;
1818
import java.util.stream.Collectors;
@@ -25,7 +25,7 @@
2525
import com.redhat.qute.commons.JavaTypeKind;
2626
import com.redhat.qute.commons.QuteJavaTypesParams;
2727
import com.redhat.qute.jdt.QuteSupportForTemplate;
28-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
28+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
2929

3030
/**
3131
* Tests for

qute.jdt/com.redhat.qute.jdt.test/src/main/java/com/redhat/qute/jdt/template/TemplateGetResolvedJavaTypeTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*******************************************************************************/
1212
package com.redhat.qute.jdt.template;
1313

14-
import static com.redhat.qute.jdt.internal.QuteProjectTest.getJDTUtils;
15-
import static com.redhat.qute.jdt.internal.QuteProjectTest.loadMavenProject;
14+
import static com.redhat.qute.jdt.QuteProjectTest.getJDTUtils;
15+
import static com.redhat.qute.jdt.QuteProjectTest.loadMavenProject;
1616

1717
import java.util.Optional;
1818

@@ -25,7 +25,7 @@
2525
import com.redhat.qute.commons.QuteResolvedJavaTypeParams;
2626
import com.redhat.qute.commons.ResolvedJavaTypeInfo;
2727
import com.redhat.qute.jdt.QuteSupportForTemplate;
28-
import com.redhat.qute.jdt.internal.QuteProjectTest.QuteMavenProjectName;
28+
import com.redhat.qute.jdt.QuteProjectTest.QuteMavenProjectName;
2929

3030
/**
3131
* Tests for

0 commit comments

Comments
 (0)