Skip to content

Alternative for the ReferencedAccessibilityTest #3525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zegveld wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Alternative for the ReferencedAccessibilityTest #3525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...ava/org/mapstruct/ap/test/accessibility/referenced/AbstractSourceTargetMapperPrivate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;

/**
*
* @author Sjaak Derksen
*/
@Mapper
@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
public abstract class AbstractSourceTargetMapperPrivate extends SourceTargetmapperPrivateBase {

public static final AbstractSourceTargetMapperPrivate INSTANCE =
Expand Down
3 changes: 2 additions & 1 deletion ...a/org/mapstruct/ap/test/accessibility/referenced/AbstractSourceTargetMapperProtected.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;

/**
*
* @author Sjaak Derksen
*/
@Mapper
@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
public abstract class AbstractSourceTargetMapperProtected extends SourceTargetmapperProtectedBase {

public static final AbstractSourceTargetMapperProtected INSTANCE =
Expand Down
112 changes: 64 additions & 48 deletions ...test/java/org/mapstruct/ap/test/accessibility/referenced/ReferencedAccessibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
*/
package org.mapstruct.ap.test.accessibility.referenced;

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

import org.junit.jupiter.api.extension.RegisterExtension;
import org.mapstruct.ap.test.accessibility.referenced.a.ReferencedMapperDefaultOther;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.ProcessorTest;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult;
import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.GeneratedSource;

/**
Expand All @@ -27,68 +26,85 @@ public class ReferencedAccessibilityTest {
final GeneratedSource generatedSource = new GeneratedSource();

@ProcessorTest
@IssueKey("206")
@WithClasses({ SourceTargetMapperPrivate.class, ReferencedMapperPrivate.class })
@ExpectedCompilationOutcome(
value = CompilationResult.SUCCEEDED,
diagnostics = {
@Diagnostic(type = SourceTargetMapperPrivate.class,
kind = javax.tools.Diagnostic.Kind.WARNING,
line = 22,
message = "Unmapped target property: \"bar\". Mapping from property " +
"\"ReferencedSource referencedSource\" to \"ReferencedTarget referencedTarget\".")
}
)
@IssueKey( "206" )
@WithClasses( { SourceTargetMapperPrivate.class, ReferencedMapperPrivate.class } )
public void shouldNotBeAbleToAccessPrivateMethodInReferenced() {
generatedSource.addComparisonToFixtureFor( SourceTargetMapperPrivate.class );
Source source = createSourceWithReferencedSourceAndField( "Foo" );

Target target = SourceTargetMapperPrivate.INSTANCE.toTarget( source );

assertThat( target.getReferencedTarget() ).isNotNull();
assertThat( target.getReferencedTarget().getBar() ).isNull();
}

@ProcessorTest
@IssueKey( "206" )
@WithClasses( { SourceTargetMapperDefaultOther.class, ReferencedMapperDefaultOther.class } )
public void shouldNotBeAbleToAccessDefaultMethodInReferencedInOtherPackage() {
generatedSource.addComparisonToFixtureFor( SourceTargetMapperDefaultOther.class );
Source source = createSourceWithReferencedSourceAndField( "Foo" );

Target target = SourceTargetMapperDefaultOther.INSTANCE.toTarget( source );

assertThat( target.getReferencedTarget() ).isNotNull();
assertThat( target.getReferencedTarget().getBar() ).isNull();
}

@ProcessorTest
@IssueKey( "206" )
@WithClasses( { AbstractSourceTargetMapperPrivate.class, SourceTargetmapperPrivateBase.class } )
public void shouldNotBeAbleToAccessPrivateMethodInBase() {
generatedSource.addComparisonToFixtureFor( AbstractSourceTargetMapperPrivate.class );
Source source = createSourceWithReferencedSourceAndField( "Foo" );

Target target = AbstractSourceTargetMapperPrivate.INSTANCE.toTarget( source );

assertThat( target.getReferencedTarget() ).isNotNull();
assertThat( target.getReferencedTarget().getBar() ).isNull();
}

@ProcessorTest
@IssueKey( "206" )
@WithClasses( { SourceTargetMapperDefaultSame.class, ReferencedMapperDefaultSame.class } )
public void shouldBeAbleToAccessDefaultMethodInReferencedInSamePackage() { }
public void shouldBeAbleToAccessDefaultMethodInReferencedInSamePackage() {
Source source = createSourceWithReferencedSourceAndField( "Foo" );

Target target = SourceTargetMapperDefaultSame.INSTANCE.toTarget( source );

assertThat( target.getReferencedTarget() ).isNotNull();
assertThat( target.getReferencedTarget().getBar() ).isEqualTo( "Foo" );
}

@ProcessorTest
@IssueKey( "206" )
@WithClasses( { SourceTargetMapperProtected.class, ReferencedMapperProtected.class } )
public void shouldBeAbleToAccessProtectedMethodInReferencedInSamePackage() { }
public void shouldBeAbleToAccessProtectedMethodInReferencedInSamePackage() {
Source source = createSourceWithReferencedSourceAndField( "Foo" );

@ProcessorTest
@IssueKey("206")
@WithClasses({ SourceTargetMapperDefaultOther.class, ReferencedMapperDefaultOther.class })
@ExpectedCompilationOutcome(
value = CompilationResult.SUCCEEDED,
diagnostics = {
@Diagnostic(type = SourceTargetMapperDefaultOther.class,
kind = javax.tools.Diagnostic.Kind.WARNING,
line = 24,
message = "Unmapped target property: \"bar\". Mapping " +
"from property \"ReferencedSource referencedSource\" to \"ReferencedTarget referencedTarget\".")
}
)
public void shouldNotBeAbleToAccessDefaultMethodInReferencedInOtherPackage() {
generatedSource.addComparisonToFixtureFor( SourceTargetMapperDefaultOther.class );
Target target = SourceTargetMapperProtected.INSTANCE.toTarget( source );

assertThat( target.getReferencedTarget() ).isNotNull();
assertThat( target.getReferencedTarget().getBar() ).isEqualTo( "Foo" );
}

@ProcessorTest
@IssueKey( "206" )
@WithClasses( { AbstractSourceTargetMapperProtected.class, SourceTargetmapperProtectedBase.class } )
public void shouldBeAbleToAccessProtectedMethodInBase() { }
public void shouldBeAbleToAccessProtectedMethodInBase() {
Source source = createSourceWithReferencedSourceAndField( "Foo" );

@ProcessorTest
@IssueKey("206")
@WithClasses({ AbstractSourceTargetMapperPrivate.class, SourceTargetmapperPrivateBase.class })
@ExpectedCompilationOutcome(
value = CompilationResult.SUCCEEDED,
diagnostics = {
@Diagnostic(type = AbstractSourceTargetMapperPrivate.class,
kind = javax.tools.Diagnostic.Kind.WARNING,
line = 23,
message = "Unmapped target property: \"bar\". Mapping from property " +
"\"ReferencedSource referencedSource\" to \"ReferencedTarget referencedTarget\".")
}
)
public void shouldNotBeAbleToAccessPrivateMethodInBase() {
generatedSource.addComparisonToFixtureFor( AbstractSourceTargetMapperPrivate.class );
Target target = AbstractSourceTargetMapperProtected.INSTANCE.toTarget( source );

assertThat( target.getReferencedTarget() ).isNotNull();
assertThat( target.getReferencedTarget().getBar() ).isEqualTo( "Foo" );
}

private Source createSourceWithReferencedSourceAndField(String fieldValue) {
Source source = new Source();
ReferencedSource referencedSource = new ReferencedSource();
referencedSource.setFoo( fieldValue );
source.setReferencedSource( referencedSource );
return source;
}
}
3 changes: 2 additions & 1 deletion ...t/java/org/mapstruct/ap/test/accessibility/referenced/SourceTargetMapperDefaultOther.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.ap.test.accessibility.referenced.a.ReferencedMapperDefaultOther;
import org.mapstruct.factory.Mappers;

/**
*
* @author Sjaak Derksen
*/
@Mapper(uses = ReferencedMapperDefaultOther.class)
@Mapper(uses = ReferencedMapperDefaultOther.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface SourceTargetMapperDefaultOther {

SourceTargetMapperDefaultOther INSTANCE =
Expand Down
3 changes: 2 additions & 1 deletion ...st/java/org/mapstruct/ap/test/accessibility/referenced/SourceTargetMapperDefaultSame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;

/**
*
* @author Sjaak Derksen
*/
@Mapper(uses = ReferencedMapperDefaultSame.class)
@Mapper(uses = ReferencedMapperDefaultSame.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface SourceTargetMapperDefaultSame {

SourceTargetMapperDefaultSame INSTANCE = Mappers.getMapper( SourceTargetMapperDefaultSame.class );
Expand Down
3 changes: 2 additions & 1 deletion ...c/test/java/org/mapstruct/ap/test/accessibility/referenced/SourceTargetMapperPrivate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;

/**
*
* @author Sjaak Derksen
*/
@Mapper(uses = ReferencedMapperPrivate.class)
@Mapper(uses = ReferencedMapperPrivate.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface SourceTargetMapperPrivate {

SourceTargetMapperPrivate INSTANCE = Mappers.getMapper( SourceTargetMapperPrivate.class );
Expand Down
3 changes: 2 additions & 1 deletion ...test/java/org/mapstruct/ap/test/accessibility/referenced/SourceTargetMapperProtected.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;

/**
*
* @author Sjaak Derksen
*/
@Mapper(uses = ReferencedMapperProtected.class)
@Mapper(uses = ReferencedMapperProtected.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface SourceTargetMapperProtected {

SourceTargetMapperProtected INSTANCE = Mappers.getMapper( SourceTargetMapperProtected.class );
Expand Down