Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Fix infinite loop when enclosing class is invalid #2146

Merged
WonderCsabo merged 2 commits into from
Jun 20, 2018
Merged

Fix infinite loop when enclosing class is invalid #2146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8021f82
Do not attemt to generate nested class when enclosing class is invalid
dodgex Jun 9, 2018
54ef8fe
Add test case to avoid regression
dodgex Jun 9, 2018
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
Prev Previous commit
Add test case to avoid regression
  • Loading branch information
@dodgex
dodgex committed Jun 18, 2018
commit 54ef8fe1cce6585c7f0d8becde9308202e84041b
29 changes: 29 additions & 0 deletions ...tations/src/test/java/org/androidannotations/generation/InvalidFragmentWithValidBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
* Copyright (C) 2016-2018 the AndroidAnnotations project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.generation;

import org.androidannotations.annotations.EBean;
import org.androidannotations.annotations.EFragment;

@EFragment
public class InvalidFragmentWithValidBean {

@EBean
public static class ValidBean {
}

}
44 changes: 44 additions & 0 deletions ...ns/src/test/java/org/androidannotations/generation/NestedEnhancedClassGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/**
* Copyright (C) 2010-2016 eBusiness Information, Excilys Group
* Copyright (C) 2016-2018 the AndroidAnnotations project
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.generation;

import java.io.IOException;

import org.androidannotations.internal.AndroidAnnotationProcessor;
import org.androidannotations.testutils.AAProcessorTestHelper;
import org.junit.Before;
import org.junit.Test;

public class NestedEnhancedClassGenerationTest extends AAProcessorTestHelper {

@Before
public void setUp() {
addManifestProcessorParameter(ActivityInManifest.class);
addProcessor(AndroidAnnotationProcessor.class);
ensureOutputDirectoryIsEmpty();
}

@Test(timeout = 10_000)
public void shouldNotLoop() throws IOException {
CompileResult result = compileFiles(InvalidFragmentWithValidBean.class);

assertCompilationErrorCount(2, result);

assertCompilationErrorOn(InvalidFragmentWithValidBean.class, "@EFragment", result);
assertCompilationErrorOn(InvalidFragmentWithValidBean.class, "@EBean", result);
}
}