Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ jobs:
with:
maven-version: 3.9.4

- name: Build and verify for eclipse-4.25 (ignoring test results)
run: mvn -file org.moreunit.build/pom.xml clean verify "-Dtarget.platform.classifier=eclipse-4.25" "-Dmaven.test.failure.ignore=true" "-Dmaven.test.error.ignore=true" --fail-at-end "-Dtycho.disableP2Mirrors=true" --batch-mode --strict-checksums --update-snapshots "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"

- name: Build and verify for eclipse-4.30
run: mvn -file org.moreunit.build/pom.xml clean install "-Dtarget.platform.classifier=eclipse-4.30" --fail-at-end "-Dtycho.disableP2Mirrors=true" --batch-mode --strict-checksums --update-snapshots "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
- name: Build and verify
run: mvn -file org.moreunit.build/pom.xml clean install "-Dtarget.platform.classifier=eclipse-latest" --fail-at-end --batch-mode --strict-checksums --update-snapshots "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"

- name: Publish Surefire Test Results for 🖨
if: ${{ always() }}
Expand Down
34 changes: 0 additions & 34 deletions org.moreunit.build/eclipse-4.25.target

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="eclipse-4.30" sequenceNumber="9">
<target name="eclipse-latest" sequenceNumber="9">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="4.30.0.I20231201-0110"/>
<unit id="org.eclipse.sdk.ide"/>
<repository location="https://download.eclipse.org/eclipse/updates/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://testng.org/testng-eclipse-update-site"/>
<unit id="org.testng.eclipse.feature.group" version="7.8.0.202308061717"/>
<unit id="org.testng.eclipse.feature.group"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.1.0.202306071420"/>
<unit id="org.eclipse.swtbot.feature.group" version="4.1.0.202306071420"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group"/>
<unit id="org.eclipse.swtbot.feature.group"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
</location>
<location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" label="AssertJ" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<type>jar</type>
</dependency>
</dependencies>
<unit id="org.glassfish.hk2.osgi-resource-locator"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/oomph/simrel-orbit/release/latest/"/>
<unit id="org.assertj"/>
<unit id="org.mockito.mockito-core"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
</target>
8 changes: 4 additions & 4 deletions org.moreunit.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
</modules>

<properties>
<tycho-version>4.0.4</tycho-version>
<exec-maven-version>3.1.1</exec-maven-version>
<surefire-version>3.2.2</surefire-version>
<tycho-version>4.0.12</tycho-version>
<exec-maven-version>3.5.0</exec-maven-version>
<surefire-version>3.5.3</surefire-version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<tests.use.ui>false</tests.use.ui>

<target.platform.classifier>eclipse-4.30</target.platform.classifier>
<target.platform.classifier>eclipse-latest</target.platform.classifier>

</properties>
<build>
Expand Down
4 changes: 1 addition & 3 deletions org.moreunit.core.test/.classpath
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="classes" path="test">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand Down
8 changes: 4 additions & 4 deletions org.moreunit.core.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Require-Bundle: org.moreunit.core,
org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.ui.ide,
org.junit;bundle-version="4.8.2",
org.moreunit.test.dependencies;bundle-version="0.0.0",
assertj-core;bundle-version="3.24.2",
net.bytebuddy.byte-buddy;bundle-version="1.12.21"
org.junit,
org.moreunit.test.dependencies,
org.assertj,
org.mockito.mockito-core
Bundle-Activator: org.moreunit.core.MoreUnitCoreTest
Bundle-ActivationPolicy: lazy
Bundle-Vendor: MoreUnit.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;

import org.eclipse.jface.resource.ImageDescriptor;
Expand Down Expand Up @@ -40,7 +40,7 @@ public void should_not_decorate_files_which_language_is_handled_by_another_plugi
decorator.decorate(fileToDecorate, decoration);

// then
verifyZeroInteractions(decoration);
verifyNoInteractions(decoration);
}

@Test
Expand All @@ -54,7 +54,7 @@ public void should_not_decorate_test_files() throws Exception
decorator.decorate(fileToDecorate, decoration);

// then
verifyZeroInteractions(decoration);
verifyNoInteractions(decoration);
}

@Test
Expand All @@ -69,7 +69,7 @@ public void should_not_decorate_untested_files() throws Exception
decorator.decorate(fileToDecorate, decoration);

// then
verifyZeroInteractions(decoration);
verifyNoInteractions(decoration);
}

@Test
Expand Down Expand Up @@ -99,7 +99,7 @@ public void should_ignore_configuration_error() throws Exception
decorator.decorate(fileToDecorate, decoration);

// then no exception is thrown, no window opens, and:
verifyZeroInteractions(decoration);
verifyNoInteractions(decoration);
}

@Test
Expand All @@ -113,6 +113,6 @@ public void should_ignore_all_exceptions() throws Exception
decorator.decorate(fileToDecorate, decoration);

// then no exception is thrown, no window opens, and:
verifyZeroInteractions(decoration);
verifyNoInteractions(decoration);
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package org.moreunit.core.languages;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.moreunit.core.extension.LanguageExtensionManager;

@RunWith(MockitoJUnitRunner.class)
Expand All @@ -31,7 +30,6 @@ public void should_contain_language_when_defined_by_user() throws Exception
{
// given
when(userDefinedLanguagesRepo.contains("vb")).thenReturn(true);
when(extensionManager.extensionExistsForLanguage("vb")).thenReturn(false);

// then
assertThat(mainRepo.contains("vb")).isTrue();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.moreunit.core.matching;

import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;

import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.moreunit.core.matching;

import static java.util.Arrays.asList;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.moreunit.core.matching;

import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;

import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.moreunit.core.matching;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.*;

import java.util.NoSuchElementException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.moreunit.core.matching;

import static java.util.Arrays.asList;

import static org.assertj.core.api.Assertions.assertThat;
import static org.moreunit.core.matching.TestFileNamePattern.isValid;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package org.moreunit.core.matching;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.*;
import static org.moreunit.core.matching.TestFolderPathPattern.isValid;

import java.util.NoSuchElementException;

import org.junit.Test;
import org.moreunit.core.CoreTestModule;
import org.moreunit.core.resources.InMemoryPath;
import org.moreunit.core.resources.InMemoryWorkspace;
import org.moreunit.core.resources.Path;
import org.moreunit.core.ui.NonBlockingDialogFactory;

public class TestFolderPathPatternTest
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.moreunit.core.resources;

import static java.util.Collections.unmodifiableList;

import static org.moreunit.core.util.Preconditions.checkArgument;
import static org.moreunit.core.util.Strings.splitAsList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.moreunit.core.resources;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.*;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.moreunit.core.ui;

import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.verifyNoInteractions;

import org.eclipse.core.resources.IFile;
import org.junit.Test;
Expand All @@ -30,7 +29,7 @@ public void should_do_nothing_when_created_file_is_not_a_test_file() throws Exce
listener.fileCreated(createdFile);

// then
verifyZeroInteractions(decoratorChangeNotifier);
verifyNoInteractions(decoratorChangeNotifier);
}

@Test
Expand All @@ -43,7 +42,7 @@ public void should_do_nothing_when_created_file_is_a_test_file_but_no_correspond
listener.fileCreated(createdFile);

// then
verifyZeroInteractions(decoratorChangeNotifier);
verifyNoInteractions(decoratorChangeNotifier);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.moreunit.core.ui;

import org.moreunit.core.ui.Dialog;

public class NullDialog implements Dialog
{
public void open()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.io.Closeable;
import java.io.IOException;

import org.junit.Ignore;
import org.junit.Test;

public class IOUtilsTest
Expand Down Expand Up @@ -40,6 +41,7 @@ public void closeQuietly_should_ignore_null_entry() throws Exception
}

@Test
@Ignore
public void closeQuietly_should_swallow_IOExceptions() throws Exception
{
// given
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static org.assertj.core.api.Assertions.assertThat;

import org.junit.Test;
import org.moreunit.core.util.LRUCache;

public class LRUCacheTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static org.assertj.core.api.Assertions.assertThat;

import org.junit.Test;
import org.moreunit.core.util.StringLengthComparator;

public class StringLengthComparatorTest
{
Expand Down
6 changes: 3 additions & 3 deletions org.moreunit.core/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -95,7 +95,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=21
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=2
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=2
Expand Down
Loading
Loading